X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/f2debbef199337c98bbd21a29203da7378067ec9..c0e4a74c713f2c6b9538cbbaf0d32d5c558d0dac:/test/bdd/environment.py diff --git a/test/bdd/environment.py b/test/bdd/environment.py index 29c6675c..6411d011 100644 --- a/test/bdd/environment.py +++ b/test/bdd/environment.py @@ -10,12 +10,12 @@ from sys import version_info as python_version logger = logging.getLogger(__name__) userconfig = { - 'BASEURL' : 'http://localhost/nominatim', 'BUILDDIR' : os.path.join(os.path.split(__file__)[0], "../../build"), 'REMOVE_TEMPLATE' : False, 'KEEP_TEST_DB' : False, 'TEMPLATE_DB' : 'test_template_nominatim', 'TEST_DB' : 'test_nominatim', + 'API_TEST_DB' : 'test_api_nominatim', 'TEST_SETTINGS_FILE' : '/tmp/nominatim_settings.php' } @@ -29,6 +29,7 @@ class NominatimEnvironment(object): self.build_dir = os.path.abspath(config['BUILDDIR']) self.template_db = config['TEMPLATE_DB'] self.test_db = config['TEST_DB'] + self.api_test_db = config['API_TEST_DB'] self.local_settings_file = config['TEST_SETTINGS_FILE'] self.reuse_template = not config['REMOVE_TEMPLATE'] self.keep_scenario_db = config['KEEP_TEST_DB'] @@ -98,7 +99,8 @@ class NominatimEnvironment(object): 'create-partition-tables', 'create-partition-functions', 'load-data', 'create-search-indices') - + def setup_api_db(self, context): + self.write_nominatim_config(self.api_test_db) def setup_db(self, context): self.setup_template_db() @@ -125,8 +127,8 @@ class NominatimEnvironment(object): def run_setup_script(self, *args, **kwargs): self.run_nominatim_script('setup', *args, **kwargs) - def run_update_script(self, *args): - self.run_nominatim_script('update', *args) + def run_update_script(self, *args, **kwargs): + self.run_nominatim_script('update', *args, **kwargs) def run_nominatim_script(self, script, *args, **kwargs): cmd = [os.path.join(self.build_dir, 'utils', '%s.php' % script)] @@ -213,6 +215,8 @@ def after_all(context): def before_scenario(context, scenario): if 'DB' in context.tags: context.nominatim.setup_db(context) + elif 'APIDB' in context.tags: + context.nominatim.setup_api_db(context) context.scene = None def after_scenario(context, scenario):