X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/62747c934d3445b000810f8a7737ea86777995e3..c3238682a8867edfb3c052ca4d2d27b3926ad17a:/test/bdd/environment.py diff --git a/test/bdd/environment.py b/test/bdd/environment.py index fdc65a5e..8847011a 100644 --- a/test/bdd/environment.py +++ b/test/bdd/environment.py @@ -15,6 +15,7 @@ userconfig = { 'REMOVE_TEMPLATE' : False, 'KEEP_TEST_DB' : False, 'DB_HOST' : None, + 'DB_PORT' : None, 'DB_USER' : None, 'DB_PASS' : None, 'TEMPLATE_DB' : 'test_template_nominatim', @@ -35,6 +36,7 @@ class NominatimEnvironment(object): self.build_dir = os.path.abspath(config['BUILDDIR']) self.src_dir = os.path.abspath(os.path.join(os.path.split(__file__)[0], "../..")) self.db_host = config['DB_HOST'] + self.db_port = config['DB_PORT'] self.db_user = config['DB_USER'] self.db_pass = config['DB_PASS'] self.template_db = config['TEMPLATE_DB'] @@ -46,6 +48,7 @@ class NominatimEnvironment(object): self.keep_scenario_db = config['KEEP_TEST_DB'] self.code_coverage_path = config['PHPCOV'] self.code_coverage_id = 1 + self.test_env = None os.environ['NOMINATIM_SETTINGS'] = self.local_settings_file self.template_db_done = False @@ -54,6 +57,8 @@ class NominatimEnvironment(object): dbargs = {'database': dbname} if self.db_host: dbargs['host'] = self.db_host + if self.db_port: + dbargs['port'] = self.db_port if self.db_user: dbargs['user'] = self.db_user if self.db_pass: @@ -68,15 +73,28 @@ class NominatimEnvironment(object): return fn def write_nominatim_config(self, dbname): + dsn = 'pgsql:dbname={}{}{}{}{}'.format( + dbname, + (';host=' + self.db_host) if self.db_host else '', + (';port=' + self.db_port) if self.db_port else '', + (';user=' + self.db_user) if self.db_user else '', + (';password=' + self.db_pass) if self.db_pass else '' + ) + self.test_env = os.environ + self.test_env['NOMINATIM_DATABASE_DSN'] = dsn + self.test_env['NOMINATIM_FLATNODE_FILE'] = '' + self.test_env['NOMINATIM_IMPORT_STYLE'] = 'full' + self.test_env['NOMINATIM_USE_US_TIGER_DATA'] = 'yes' + f = open(self.local_settings_file, 'w') - f.write("