X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/5afd96d210ed0ad14a5d00f832f6e6a28558e733..d856788bf5cf7b4b3e2b4de10f37cf3002ae6826:/test/bdd/environment.py?ds=sidebyside diff --git a/test/bdd/environment.py b/test/bdd/environment.py index 460f3569..7535c508 100644 --- a/test/bdd/environment.py +++ b/test/bdd/environment.py @@ -1,20 +1,22 @@ -# SPDX-License-Identifier: GPL-2.0-only +# SPDX-License-Identifier: GPL-3.0-or-later # # This file is part of Nominatim. (https://nominatim.org) # -# Copyright (C) 2022 by the Nominatim developer community. +# Copyright (C) 2024 by the Nominatim developer community. # For a full list of authors see the git log. from pathlib import Path +import sys from behave import * +sys.path.insert(1, str(Path(__file__, '..', '..', '..', 'src').resolve())) + from steps.geometry_factory import GeometryFactory from steps.nominatim_environment import NominatimEnvironment -TEST_BASE_DIR = Path(__file__) / '..' / '..' +TEST_BASE_DIR = Path(__file__, '..', '..').resolve() userconfig = { - 'BUILDDIR' : (TEST_BASE_DIR / '..' / 'build').resolve(), 'REMOVE_TEMPLATE' : False, 'KEEP_TEST_DB' : False, 'DB_HOST' : None, @@ -24,12 +26,10 @@ userconfig = { '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, + 'API_TEST_FILE' : TEST_BASE_DIR / 'testdb' / 'apidb-test-data.pbf', 'TOKENIZER' : None, # Test with a custom tokenizer 'STYLE' : 'extratags', - 'API_ENGINE': 'falcon', - 'PHPCOV' : False, # set to output directory to enable code coverage + 'API_ENGINE': 'falcon' } use_step_matcher("re") @@ -59,15 +59,3 @@ def before_scenario(context, scenario): 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.")