X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/c3788d765ed4e7ddf00794085af757714bc102cf..381c9395747a04672acba395e0bd14332d1a9db9:/test/bdd/environment.py diff --git a/test/bdd/environment.py b/test/bdd/environment.py index 0acc73b4..afaa5151 100644 --- a/test/bdd/environment.py +++ b/test/bdd/environment.py @@ -27,6 +27,8 @@ userconfig = { 'API_TEST_FILE' : (TEST_BASE_DIR / 'testdb' / 'apidb-test-data.pbf').resolve(), 'SERVER_MODULE_PATH' : None, 'TOKENIZER' : None, # Test with a custom tokenizer + 'STYLE' : 'extratags', + 'API_ENGINE': 'php', 'PHPCOV' : False, # set to output directory to enable code coverage } @@ -50,7 +52,6 @@ def before_scenario(context, scenario): context.nominatim.setup_api_db() elif 'UNKNOWNDB' in context.tags: context.nominatim.setup_unknown_db() - context.scene = None def after_scenario(context, scenario): if 'DB' in context.tags: @@ -59,5 +60,11 @@ def after_scenario(context, scenario): def before_tag(context, tag): if tag == 'fail-legacy': - if context.config.userdata['TOKENIZER'] in (None, 'legacy'): + if context.config.userdata['TOKENIZER'] == 'legacy': context.scenario.skip("Not implemented in legacy tokenizer") + if tag == 'v1-api-php-only': + if context.config.userdata['API_ENGINE'] != 'php': + context.scenario.skip("Only valid with PHP version of v1 API.") + if tag == 'v1-api-python-only': + if context.config.userdata['API_ENGINE'] == 'php': + context.scenario.skip("Only valid with Python version of v1 API.")