From e1030d3670feb5580ce51b6fc2ef3b8e9f8d2380 Mon Sep 17 00:00:00 2001 From: Dhruv Date: Thu, 20 Jun 2013 18:42:42 +0530 Subject: [PATCH] [ticket/11608] Set sphinx id from test_config file for tests PHPBB3-11608 --- tests/functional/search_sphinx_test.php | 5 ++++- tests/test_framework/phpbb_test_case_helpers.php | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/tests/functional/search_sphinx_test.php b/tests/functional/search_sphinx_test.php index c70ea04715..6b94f388c4 100644 --- a/tests/functional/search_sphinx_test.php +++ b/tests/functional/search_sphinx_test.php @@ -20,6 +20,9 @@ class phpbb_functional_search_sphinx_test extends phpbb_functional_search_test { parent::setUp(); $this->search_backend = 'phpbb_search_fulltext_sphinx'; - $this->markTestIncomplete('Sphinx search not running for the test board'); + if (!isset($config['fulltext_sphinx_id'])) + { + $this->markTestIncomplete('Sphinx search not running for the test board'); + } } } diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php index 351a3a9594..2f225fe7af 100644 --- a/tests/test_framework/phpbb_test_case_helpers.php +++ b/tests/test_framework/phpbb_test_case_helpers.php @@ -158,6 +158,11 @@ class phpbb_test_case_helpers { $config['redis_port'] = $phpbb_redis_port; } + + if (isset($fulltext_sphinx_id)) + { + $config['fulltext_sphinx_id'] = $fulltext_sphinx_id; + } } if (isset($_SERVER['PHPBB_TEST_DBMS']))