hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-16 15:47:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

bdd tests: make import style configurable

Browse Source 
The switch is for development. Tests are not guaranteed to still
work when run with anything but the 'extratags' style.
This commit is contained in:
Sarah Hoffmann
2022-10-04 17:01:25 +02:00
parent 981e9700be
commit de2a3bd5f8
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/bdd/environment.py
View File

@@ -27,6 +27,7 @@ userconfig = {
'API_TEST_FILE' : (TEST_BASE_DIR / 'testdb' / 'apidb-test-data.pbf').resolve(), '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 'TOKENIZER' : None, # Test with a custom tokenizer
'STYLE' : 'extratags',
'PHPCOV' : False, # set to output directory to enable code coverage 'PHPCOV' : False, # set to output directory to enable code coverage
} }

3
test/bdd/steps/nominatim_environment.py
View File

@@ -36,6 +36,7 @@ class NominatimEnvironment:
self.api_test_db = config['API_TEST_DB'] self.api_test_db = config['API_TEST_DB']
self.api_test_file = config['API_TEST_FILE'] self.api_test_file = config['API_TEST_FILE']
self.tokenizer = config['TOKENIZER'] self.tokenizer = config['TOKENIZER']
self.import_style = config['STYLE']
self.server_module_path = config['SERVER_MODULE_PATH'] self.server_module_path = config['SERVER_MODULE_PATH']
self.reuse_template = not config['REMOVE_TEMPLATE'] self.reuse_template = not config['REMOVE_TEMPLATE']
self.keep_scenario_db = config['KEEP_TEST_DB'] self.keep_scenario_db = config['KEEP_TEST_DB']
@@ -107,6 +108,8 @@ class NominatimEnvironment:
self.test_env['NOMINATIM_NOMINATIM_TOOL'] = str((self.build_dir / 'nominatim').resolve()) self.test_env['NOMINATIM_NOMINATIM_TOOL'] = str((self.build_dir / 'nominatim').resolve())
if self.tokenizer is not None: if self.tokenizer is not None:
self.test_env['NOMINATIM_TOKENIZER'] = self.tokenizer self.test_env['NOMINATIM_TOKENIZER'] = self.tokenizer
if self.import_style is not None:
self.test_env['NOMINATIM_IMPORT_STYLE'] = self.import_style
if self.server_module_path: if self.server_module_path:
self.test_env['NOMINATIM_DATABASE_MODULE_PATH'] = self.server_module_path self.test_env['NOMINATIM_DATABASE_MODULE_PATH'] = self.server_module_path

2
test/bdd/steps/steps_osm_data.py
View File

@@ -17,7 +17,7 @@ def get_osm2pgsql_options(nominatim_env, fname, append):
return dict(import_file=fname, return dict(import_file=fname,
osm2pgsql=str(nominatim_env.build_dir / 'osm2pgsql' / 'osm2pgsql'), osm2pgsql=str(nominatim_env.build_dir / 'osm2pgsql' / 'osm2pgsql'),
osm2pgsql_cache=50, osm2pgsql_cache=50,
osm2pgsql_style=str(nominatim_env.src_dir / 'settings' / 'import-extratags.style'), osm2pgsql_style=str(nominatim_env.get_test_config().get_import_style_file()),
threads=1, threads=1,
dsn=nominatim_env.get_libpq_dsn(), dsn=nominatim_env.get_libpq_dsn(),
flatnode_file='', flatnode_file='',