simplify weigh_search() function

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

diff --git a/test/bdd/environment.py b/test/bdd/environment.py
index ee07e6028c1ca67497082316821fb219a0c0d9f6..664b5ac79e7d2013182ebff5036f04889870f586 100644 (file)
--- 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
     '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
 }
 
     'PHPCOV' : False, # set to output directory to enable code coverage
 }
 


@@ -44,13 +46,15 @@ def before_all(context):
 
 
 def before_scenario(context, scenario):
 
 
 def before_scenario(context, scenario):

-    if 'DB' in context.tags:
+    if not 'SQLITE' in context.tags \
+       and context.config.userdata['API_TEST_DB'].startswith('sqlite:'):
+        context.scenario.skip("Not usable with Sqlite database.")
+    elif 'DB' in context.tags:

         context.nominatim.setup_db(context)
     elif 'APIDB' in context.tags:
         context.nominatim.setup_api_db()
     elif 'UNKNOWNDB' in context.tags:
         context.nominatim.setup_unknown_db()
         context.nominatim.setup_db(context)
     elif 'APIDB' in context.tags:
         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:
 
 def after_scenario(context, scenario):
     if 'DB' in context.tags:


@@ -61,3 +65,9 @@ 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 == '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.")