From 4d06a3d10b3db90fec851e759fbf0e25f167e01d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 30 Jan 2020 03:33:17 +0100 Subject: [PATCH] Travis --- .travis.yml | 14 +++++++------- test/phpunit/ExportTest.php | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 883cf73f801..7e4b35ec012 100644 --- a/.travis.yml +++ b/.travis.yml @@ -203,13 +203,13 @@ before_script: if [ "$DB" = 'postgresql' ]; then #pgsql travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql #pgloader mysql://root:pass@127.0.0.1/dolibarr_9 postgresql://dolibarrowner:dolibarrownerpass@127.0.0.1/dolibarr_dev - echo pgloader mysql://root@127.0.0.1/travis postgresql:///travis - pgloader mysql://root@127.0.0.1/travis postgresql:///travis - echo 'ALTER SEQUENCE llx_accountingaccount_rowid_seq RENAME TO llx_accounting_account_rowid_seq' | psql travis - echo 'ALTER SEQUENCE llx_accounting_account_rowid_seq RESTART WITH 1000001;' | psql travis - #echo 'select * from INFORMATION_SCHEMA.COLUMNS where table_name = 'llx_accountingaccount' | psql travis - #echo 'select * from information_schema.table_constraints;' | psql travis - #echo 'ALTER TABLE "llx_accounting_account" DROP CONSTRAINT "idx_16390_primary"' | psql travis + echo pgloader mysql://root@127.0.0.1/travis postgresql://postgresql@127.0.0.1/travis + pgloader mysql://root@127.0.0.1/travis postgresql://postgresql@127.0.0.1/travis + echo 'ALTER SEQUENCE llx_accountingaccount_rowid_seq RENAME TO llx_accounting_account_rowid_seq' | psql -U postgresql travis + echo 'ALTER SEQUENCE llx_accounting_account_rowid_seq RESTART WITH 1000001;' | psql -U postgresql travis + #echo 'select * from INFORMATION_SCHEMA.COLUMNS where table_name = 'llx_accountingaccount' | psql -U postgresql travis + #echo 'select * from information_schema.table_constraints;' | psql -U postgresql travis + #echo 'ALTER TABLE "llx_accounting_account" DROP CONSTRAINT "idx_16390_primary"' | psql -U postgresql travis fi echo diff --git a/test/phpunit/ExportTest.php b/test/phpunit/ExportTest.php index 00b3e80a9d5..3abec2ee0e1 100644 --- a/test/phpunit/ExportTest.php +++ b/test/phpunit/ExportTest.php @@ -251,12 +251,12 @@ class ExportTest extends PHPUnit\Framework\TestCase $model='excel2007new'; // Build export file - /* ko on php 7.4 on travis (zip not available) + /* ko on php 7.4 on travis (zip not available) */ print "Process build_file for model = ".$model."\n"; $result=$objexport->build_file($user, $model, $datatoexport, $array_selected, array(), $sql); $expectedresult=1; $this->assertEquals($expectedresult, $result, 'Error in Excel2007new export'); - */ + return true; }