aboutsummaryrefslogtreecommitdiffstats
path: root/tests/test_framework/phpbb_test_case_helpers.php
diff options
context:
space:
mode:
authorIgor Wiedler <igor@wiedler.ch>2012-12-07 13:31:37 -0800
committerIgor Wiedler <igor@wiedler.ch>2012-12-07 13:31:37 -0800
commitb0b5a13131b90b8320de6f49db6c505d38b42c96 (patch)
tree641a33e35665c3b8198fd2d641a687560342ba56 /tests/test_framework/phpbb_test_case_helpers.php
parent74093d0fd383619ec8b58914ebe2edd68145e070 (diff)
parent26fd70d9cdffe0107635db5f3846dbe5ea6e3fae (diff)
downloadforums-b0b5a13131b90b8320de6f49db6c505d38b42c96.tar
forums-b0b5a13131b90b8320de6f49db6c505d38b42c96.tar.gz
forums-b0b5a13131b90b8320de6f49db6c505d38b42c96.tar.bz2
forums-b0b5a13131b90b8320de6f49db6c505d38b42c96.tar.xz
forums-b0b5a13131b90b8320de6f49db6c505d38b42c96.zip
Merge pull request #18 from p/ticket/11015
Ticket/11015
Diffstat (limited to 'tests/test_framework/phpbb_test_case_helpers.php')
-rw-r--r--tests/test_framework/phpbb_test_case_helpers.php19
1 files changed, 19 insertions, 0 deletions
diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index 96a546e538..18f575b980 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -91,6 +91,15 @@ class phpbb_test_case_helpers
{
$config['phpbb_functional_url'] = $phpbb_functional_url;
}
+
+ if (isset($phpbb_redis_host))
+ {
+ $config['redis_host'] = $phpbb_redis_host;
+ }
+ if (isset($phpbb_redis_port))
+ {
+ $config['redis_port'] = $phpbb_redis_port;
+ }
}
if (isset($_SERVER['PHPBB_TEST_DBMS']))
@@ -113,6 +122,16 @@ class phpbb_test_case_helpers
));
}
+ if (isset($_SERVER['PHPBB_TEST_REDIS_HOST']))
+ {
+ $config['redis_host'] = $_SERVER['PHPBB_TEST_REDIS_HOST'];
+ }
+
+ if (isset($_SERVER['PHPBB_TEST_REDIS_PORT']))
+ {
+ $config['redis_port'] = $_SERVER['PHPBB_TEST_REDIS_PORT'];
+ }
+
return $config;
}