Make unit tests fail from cliupdate aswell

sebeka · Oct 15, 2018 · 54cda93 · 54cda93
1 parent 1c2ae4d
commit 54cda93
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -30,16 +30,16 @@ shared: &shared
           mysql -h 127.0.0.1 -u root -e 'create database glpitest0723;'
           mysql -h 127.0.0.1 -u root glpitest0723 < tests/glpi-0.72.3-empty.sql
           cp tests/circleci.config_db.php tests/config_db.php
-          php scripts/cliupdate.php --config-dir=../tests --dev
-          php scripts/cliupdate.php --config-dir=../tests --dev |grep -q "No migration needed." || (echo "scripts/cliupdate.php FAILED" && exit 1)
+          php scripts/cliupdate.php --config-dir=../tests --dev --tests
+          php scripts/cliupdate.php --config-dir=../tests --dev --tests |grep -q "No migration needed." || (echo "scripts/cliupdate.php FAILED" && exit 1)
           php scripts/innodb_migration.php --config-dir=../tests
           rm tests/config_db.php
     - run:
         name: Install DB
         command: |
           mysql -h 127.0.0.1 -u root -e 'create database glpitest;'
           php scripts/cliinstall.php --db=glpitest --host=127.0.0.1 --user=root --tests
-          php scripts/cliupdate.php --config-dir=../tests |grep -q "No migration needed." || (echo "scripts/cliupdate.php FAILED" && exit 1)
+          php scripts/cliupdate.php --config-dir=../tests --tests |grep -q "No migration needed." || (echo "scripts/cliupdate.php FAILED" && exit 1)
     - run:
         name: Database tests
         command: php vendor/bin/atoum -p 'php -d memory_limit=512M' --debug --force-terminal --use-dot-report --configurations tests/telemetry.php --bootstrap-file tests/bootstrap.php --no-code-coverage --max-children-number 1 -d tests/database

diff --git a/scripts/cliupdate.php b/scripts/cliupdate.php
@@ -49,6 +49,10 @@
    }
 }
 
+if (isset($args['tests'])) {
+   define('TU_USER', 'CLI');
+}
+
 if (isset($args['config-dir'])) {
    define("GLPI_CONFIG_DIR", $args['config-dir']);
 }