diff options
| author | Dhruv <dhruv.goel92@gmail.com> | 2013-06-20 18:42:42 +0530 |
|---|---|---|
| committer | Dhruv <dhruv.goel92@gmail.com> | 2013-10-05 21:15:32 +0530 |
| commit | e1030d3670feb5580ce51b6fc2ef3b8e9f8d2380 (patch) | |
| tree | 9a10a2c5f498cbba39b46db2ea66d81c93d19a9e /tests | |
| parent | 75d16da9fad8ae7ca067841b1f17dabef97dc0af (diff) | |
| download | forums-e1030d3670feb5580ce51b6fc2ef3b8e9f8d2380.tar forums-e1030d3670feb5580ce51b6fc2ef3b8e9f8d2380.tar.gz forums-e1030d3670feb5580ce51b6fc2ef3b8e9f8d2380.tar.bz2 forums-e1030d3670feb5580ce51b6fc2ef3b8e9f8d2380.tar.xz forums-e1030d3670feb5580ce51b6fc2ef3b8e9f8d2380.zip | |
[ticket/11608] Set sphinx id from test_config file for tests
PHPBB3-11608
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/functional/search_sphinx_test.php | 5 | ||||
| -rw-r--r-- | tests/test_framework/phpbb_test_case_helpers.php | 5 |
2 files changed, 9 insertions, 1 deletions
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'])) |