aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2010-04-01 19:15:34 +0200
committerNils Adermann <naderman@naderman.de>2010-04-01 19:15:34 +0200
commit2bbfa9c29f4ce33d25e58c550540e236a4ee3c1a (patch)
treeb00d401cc605da55c024192d758086cf72918336
parent53ab8886b1a3a98291627e2baab94ec86c7df685 (diff)
downloadforums-2bbfa9c29f4ce33d25e58c550540e236a4ee3c1a.tar
forums-2bbfa9c29f4ce33d25e58c550540e236a4ee3c1a.tar.gz
forums-2bbfa9c29f4ce33d25e58c550540e236a4ee3c1a.tar.bz2
forums-2bbfa9c29f4ce33d25e58c550540e236a4ee3c1a.tar.xz
forums-2bbfa9c29f4ce33d25e58c550540e236a4ee3c1a.zip
[feature/dbal-tests] Only output the missing config error message once.
The error message was also not properly escaping the variables, thus producing an incorrect example configuration file.
-rw-r--r--tests/test_framework/phpbb_test_case_helpers.php24
1 files changed, 18 insertions, 6 deletions
diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index f9ab750218..0c5932e1ad 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -20,16 +20,28 @@ class phpbb_test_case_helpers
public function get_database_config()
{
+ static $show_error = true;
+
if (!file_exists('test_config.php'))
{
+ if ($show_error)
+ {
+ $show_error = false;
+ }
+ else
+ {
+ $this->test_case->markTestSkipped('Missing test_config.php: See first error.');
+ return;
+ }
+
trigger_error("You have to create a test_config.php like this:
\"<?php
-$dbms = 'mysqli';
-$dbhost = 'localhost';
-$dbport = '';
-$dbname = 'database';
-$dbuser = 'user';
-$dbpasswd = 'password';
+\$dbms = 'mysqli';
+\$dbhost = 'localhost';
+\$dbport = '';
+\$dbname = 'database';
+\$dbuser = 'user';
+\$dbpasswd = 'password';
\"
NOTE: The database is dropped and recreated with the phpbb-db-schema! Do NOT specify a database with important data.", E_USER_ERROR);