summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2016-09-26 10:47:26 +0200
committerRemi Collet <fedora@famillecollet.com>2016-09-26 10:47:26 +0200
commitbc172ca3c6b86082e524ffa8033528d7bf9fd2c8 (patch)
tree2dc9b9fb158d9f463fc0cd2053dcf9e6653eb33d
parent81f13d7be1fbf471969cbe756a4a78f8bf899d1d (diff)
glpi: fix test suite
-rw-r--r--glpi-9.1-config_db_test.php8
-rw-r--r--glpi-dev.spec4
2 files changed, 2 insertions, 10 deletions
diff --git a/glpi-9.1-config_db_test.php b/glpi-9.1-config_db_test.php
deleted file mode 100644
index 4bc22c1..0000000
--- a/glpi-9.1-config_db_test.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
- class DB extends DBmysql {
- public $dbhost = '127.0.0.1';
- public $dbuser = 'root';
- public $dbpassword = '';
- public $dbdefault = 'glpitest';
-}
-
diff --git a/glpi-dev.spec b/glpi-dev.spec
index 2d628f9..1b24917 100644
--- a/glpi-dev.spec
+++ b/glpi-dev.spec
@@ -50,7 +50,6 @@ Source0: https://github.com/%{gh_owner}/%{name}/archive/%{gh_commit}/%{na
Source1: %{name}-httpd.conf
Source2: %{name}-9.1-config_path.php
Source12: %{name}-9.1-config_path_test.php
-Source13: %{name}-9.1-config_db_test.php
Source3: %{name}-logrotate
Source4: %{name}-nginx.conf
Source5: %{name}-fedora-autoloader.php
@@ -333,10 +332,11 @@ done
: Set tests configuration
cp %{SOURCE12} config/config_path.php
-cp %{SOURCE13} config/config_db.php
: Run upstream test suite
php tools/cliinstall.php --host=127.0.0.1:3308 --db=glpitest --user=root --tests --force --lang=en_US || RET=1
+cp tests/config_db.php config/
+
%{_bindir}/phpunit --verbose || RET=1
: Cleanup