diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-07-17 21:10:41 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-07-17 21:12:47 +0200 |
| commit | 4a87bc2aa92b086bbc04a735cb0d1564e4d0c903 (patch) | |
| tree | 02c5f00e21ca2fef92a510dca70fd33a3668b008 /tests/test_framework/phpbb_test_case_helpers.php | |
| parent | 0f70c930df3d5fbcfcf1855555757749a9c1a0fb (diff) | |
| parent | 29b36b214a809b6ae49f941a4e3965ffba2b8741 (diff) | |
| download | forums-4a87bc2aa92b086bbc04a735cb0d1564e4d0c903.tar forums-4a87bc2aa92b086bbc04a735cb0d1564e4d0c903.tar.gz forums-4a87bc2aa92b086bbc04a735cb0d1564e4d0c903.tar.bz2 forums-4a87bc2aa92b086bbc04a735cb0d1564e4d0c903.tar.xz forums-4a87bc2aa92b086bbc04a735cb0d1564e4d0c903.zip | |
Merge remote-tracking branch 'github-noxwizard/ticket/10678' into develop-olympus
* github-noxwizard/ticket/10678:
[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
Conflicts:
tests/RUNNING_TESTS.txt
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 2a3c27f9f9..29adfc6817 100644 --- a/tests/test_framework/phpbb_test_case_helpers.php +++ b/tests/test_framework/phpbb_test_case_helpers.php @@ -79,6 +79,7 @@ class phpbb_test_case_helpers 'dbname' => $dbname, 'dbuser' => $dbuser, 'dbpasswd' => $dbpasswd, + 'custom_dsn' => isset($custom_dsn) ? $custom_dsn : '', )); if (isset($phpbb_functional_url)) @@ -95,7 +96,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'] : '', )); } |