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 2c27716586fd1752730421c8e043ab8b1b4aced3..afaa51512a7c1041e659725e2bc6ca9bfaaae77e 100644 (file)
--- a/test/bdd/environment.py
+++ b/test/bdd/environment.py
@@ -1,3 +1,9 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# This file is part of Nominatim. (https://nominatim.org)
+#
+# Copyright (C) 2022 by the Nominatim developer community.
+# For a full list of authors see the git log.

 from pathlib import Path
 
 from behave import *
 from pathlib import Path
 
 from behave import *


@@ -21,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,7 +52,6 @@ def before_scenario(context, scenario):
         context.nominatim.setup_api_db()
     elif 'UNKNOWNDB' in context.tags:
         context.nominatim.setup_unknown_db()
         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:


@@ -53,5 +60,11 @@ def after_scenario(context, scenario):
 
 def before_tag(context, tag):
     if tag == 'fail-legacy':
 
 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")
             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.")