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 aeee2301bb6c063d8efcc7b73d01d698c99a541f..ee07e6028c1ca67497082316821fb219a0c0d9f6 100644 (file)
--- a/test/bdd/environment.py
+++ b/test/bdd/environment.py
@@ -1,11 +1,20 @@
-from behave import *
+# 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 pathlib import Path
 

+from behave import *
+

 from steps.geometry_factory import GeometryFactory
 from steps.nominatim_environment import NominatimEnvironment
 
 from steps.geometry_factory import GeometryFactory
 from steps.nominatim_environment import NominatimEnvironment
 

+TEST_BASE_DIR = Path(__file__) / '..' / '..'
+

 userconfig = {
 userconfig = {

-    'BUILDDIR' : (Path(__file__) / '..' / '..' / '..' / 'build').resolve(),
+    'BUILDDIR' : (TEST_BASE_DIR / '..' / 'build').resolve(),

     'REMOVE_TEMPLATE' : False,
     'KEEP_TEST_DB' : False,
     'DB_HOST' : None,
     'REMOVE_TEMPLATE' : False,
     'KEEP_TEST_DB' : False,
     'DB_HOST' : None,


@@ -15,7 +24,9 @@ userconfig = {
     'TEMPLATE_DB' : 'test_template_nominatim',
     'TEST_DB' : 'test_nominatim',
     'API_TEST_DB' : 'test_api_nominatim',
     'TEMPLATE_DB' : 'test_template_nominatim',
     'TEST_DB' : 'test_nominatim',
     'API_TEST_DB' : 'test_api_nominatim',

+    'API_TEST_FILE'  : (TEST_BASE_DIR / 'testdb' / 'apidb-test-data.pbf').resolve(),

     'SERVER_MODULE_PATH' : None,
     'SERVER_MODULE_PATH' : None,

+    'TOKENIZER' : None, # Test with a custom tokenizer

     'PHPCOV' : False, # set to output directory to enable code coverage
 }
 
     'PHPCOV' : False, # set to output directory to enable code coverage
 }
 


@@ -44,3 +55,9 @@ 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")