diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-07-17 21:13:05 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-07-17 21:13:05 +0200 |
| commit | a3757763ac32be8261aab6e92b696e733e995c59 (patch) | |
| tree | 4f343311f1d52158652145935dbd30bf929f7d2e /tests/test_framework/phpbb_test_case_helpers.php | |
| parent | 2090ecfb8f5b53aad8d1b5a6e42e88a28e533ee5 (diff) | |
| parent | 4a87bc2aa92b086bbc04a735cb0d1564e4d0c903 (diff) | |
| download | forums-a3757763ac32be8261aab6e92b696e733e995c59.tar forums-a3757763ac32be8261aab6e92b696e733e995c59.tar.gz forums-a3757763ac32be8261aab6e92b696e733e995c59.tar.bz2 forums-a3757763ac32be8261aab6e92b696e733e995c59.tar.xz forums-a3757763ac32be8261aab6e92b696e733e995c59.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10678] Typo and formatting
[ticket/10678] Add port handling for MSSQL tests
[ticket/10678] Move config changes to new location
[ticket/10678] Rename helper class file
[ticket/10678] Lowercase class name, adjust comment width
[ticket/10678] More formatting and docblocks
[ticket/10678] More formatting requests
[ticket/10678] Fix formatting
[ticket/10678] Add better support for Firebird, Oracle, and MSSQL
Diffstat (limited to 'tests/test_framework/phpbb_test_case_helpers.php')
| -rw-r--r-- | tests/test_framework/phpbb_test_case_helpers.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php index 329af2c537..46feef550a 100644 --- a/tests/test_framework/phpbb_test_case_helpers.php +++ b/tests/test_framework/phpbb_test_case_helpers.php @@ -84,6 +84,7 @@ class phpbb_test_case_helpers 'dbname' => $dbname, 'dbuser' => $dbuser, 'dbpasswd' => $dbpasswd, + 'custom_dsn' => isset($custom_dsn) ? $custom_dsn : '', )); if (isset($phpbb_functional_url)) @@ -100,7 +101,8 @@ class phpbb_test_case_helpers 'dbport' => isset($_SERVER['PHPBB_TEST_DBPORT']) ? $_SERVER['PHPBB_TEST_DBPORT'] : '', 'dbname' => isset($_SERVER['PHPBB_TEST_DBNAME']) ? $_SERVER['PHPBB_TEST_DBNAME'] : '', 'dbuser' => isset($_SERVER['PHPBB_TEST_DBUSER']) ? $_SERVER['PHPBB_TEST_DBUSER'] : '', - 'dbpasswd' => isset($_SERVER['PHPBB_TEST_DBPASSWD']) ? $_SERVER['PHPBB_TEST_DBPASSWD'] : '' + 'dbpasswd' => isset($_SERVER['PHPBB_TEST_DBPASSWD']) ? $_SERVER['PHPBB_TEST_DBPASSWD'] : '', + 'custom_dsn' => isset($_SERVER['PHPBB_TEST_CUSTOM_DSN']) ? $_SERVER['PHPBB_TEST_CUSTOM_DSN'] : '', )); } |