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..f179c8f13da343283b0aaf4deb855587a471cd6f 100644 (file)
--- a/test/bdd/environment.py
+++ b/test/bdd/environment.py
@@ -1,11 +1,14 @@
-from behave import *

 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 +18,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
 }