Merge remote-tracking branch 'upstream/master'

[nominatim.git] / test / bdd / environment.py

diff --git a/test/bdd/environment.py b/test/bdd/environment.py
index 155b8d90a01fd18614481e5f22452011d5262f34..7535c5086133a1e9dd2a4ffb62c1f48ec278850a 100644 (file)
--- a/test/bdd/environment.py
+++ b/test/bdd/environment.py
@@ -27,7 +27,6 @@ userconfig = {
     'TEST_DB' : 'test_nominatim',
     'API_TEST_DB' : 'test_api_nominatim',
     'API_TEST_FILE'  : TEST_BASE_DIR / 'testdb' / 'apidb-test-data.pbf',
     'TEST_DB' : 'test_nominatim',
     'API_TEST_DB' : 'test_api_nominatim',
     'API_TEST_FILE'  : TEST_BASE_DIR / 'testdb' / 'apidb-test-data.pbf',

-    'SERVER_MODULE_PATH' : None,

     'TOKENIZER' : None, # Test with a custom tokenizer
     'STYLE' : 'extratags',
     'API_ENGINE': 'falcon'
     'TOKENIZER' : None, # Test with a custom tokenizer
     'STYLE' : 'extratags',
     'API_ENGINE': 'falcon'


@@ -60,15 +59,3 @@ def before_scenario(context, scenario):
 def after_scenario(context, scenario):
     if 'DB' in context.tags:
         context.nominatim.teardown_db(context)
 def after_scenario(context, scenario):
     if 'DB' in context.tags:
         context.nominatim.teardown_db(context)

-
-
-def before_tag(context, tag):
-    if tag == 'fail-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.")