X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/72587b08fa66d70930b279a7ed96a945ed6c27e7..fec1ed32cdaaaebe6746fde53279cd8859cbf460:/test/bdd/steps/nominatim_environment.py?ds=inline diff --git a/test/bdd/steps/nominatim_environment.py b/test/bdd/steps/nominatim_environment.py index 7741d667..168334b1 100644 --- a/test/bdd/steps/nominatim_environment.py +++ b/test/bdd/steps/nominatim_environment.py @@ -1,10 +1,15 @@ -import os from pathlib import Path +import sys import tempfile import psycopg2 import psycopg2.extras +sys.path.insert(1, str((Path(__file__) / '..' / '..' / '..' / '..').resolve())) + +from nominatim import cli +from nominatim.config import Configuration +from nominatim.tools import refresh from steps.utils import run_script class NominatimEnvironment: @@ -21,14 +26,17 @@ class NominatimEnvironment: self.template_db = config['TEMPLATE_DB'] self.test_db = config['TEST_DB'] self.api_test_db = config['API_TEST_DB'] + self.api_test_file = config['API_TEST_FILE'] self.server_module_path = config['SERVER_MODULE_PATH'] self.reuse_template = not config['REMOVE_TEMPLATE'] self.keep_scenario_db = config['KEEP_TEST_DB'] self.code_coverage_path = config['PHPCOV'] self.code_coverage_id = 1 - self.test_env = None + self.default_config = Configuration(None, self.src_dir / 'settings').get_os_env() + self.test_env = None self.template_db_done = False + self.api_db_done = False self.website_dir = None def connect_database(self, dbname): @@ -76,20 +84,30 @@ class NominatimEnvironment: and dsn == self.test_env['NOMINATIM_DATABASE_DSN']: return # environment already set uo - self.test_env = os.environ + self.test_env = dict(self.default_config) 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' + self.test_env['NOMINATIM_DATADIR'] = str((self.src_dir / 'data').resolve()) + self.test_env['NOMINATIM_SQLDIR'] = str((self.src_dir / 'lib-sql').resolve()) + self.test_env['NOMINATIM_CONFIGDIR'] = str((self.src_dir / 'settings').resolve()) + self.test_env['NOMINATIM_DATABASE_MODULE_SRC_PATH'] = str((self.build_dir / 'module').resolve()) + self.test_env['NOMINATIM_OSM2PGSQL_BINARY'] = str((self.build_dir / 'osm2pgsql' / 'osm2pgsql').resolve()) + self.test_env['NOMINATIM_NOMINATIM_TOOL'] = str((self.build_dir / 'nominatim').resolve()) if self.server_module_path: self.test_env['NOMINATIM_DATABASE_MODULE_PATH'] = self.server_module_path + else: + # avoid module being copied into the temporary environment + self.test_env['NOMINATIM_DATABASE_MODULE_PATH'] = str((self.build_dir / 'module').resolve()) if self.website_dir is not None: self.website_dir.cleanup() self.website_dir = tempfile.TemporaryDirectory() - self.run_setup_script('setup-website') + cfg = Configuration(None, self.src_dir / 'settings', environ=self.test_env) + refresh.setup_website(Path(self.website_dir.name) / 'website', self.src_dir / 'lib-php', cfg) def db_drop_database(self, name): @@ -111,18 +129,8 @@ class NominatimEnvironment: self.template_db_done = True - if self.reuse_template: - # check that the template is there - conn = self.connect_database('postgres') - cur = conn.cursor() - cur.execute('select count(*) from pg_database where datname = %s', - (self.template_db,)) - if cur.fetchone()[0] == 1: - return - conn.close() - else: - # just in case... make sure a previous table has been dropped - self.db_drop_database(self.template_db) + if self._reuse_or_drop_db(self.template_db): + return try: # call the first part of database setup @@ -162,6 +170,30 @@ class NominatimEnvironment: """ self.write_nominatim_config(self.api_test_db) + if self.api_db_done: + return + + self.api_db_done = True + + if self._reuse_or_drop_db(self.api_test_db): + return + + testdata = Path('__file__') / '..' / '..' / 'testdb' + self.test_env['NOMINATIM_TIGER_DATA_PATH'] = str((testdata / 'tiger').resolve()) + self.test_env['NOMINATIM_WIKIPEDIA_DATA_PATH'] = str(testdata.resolve()) + + try: + self.run_nominatim('import', '--osm-file', str(self.api_test_file)) + self.run_setup_script('import-tiger-data') + self.run_nominatim('freeze') + + phrase_file = str((testdata / 'specialphrases_testdb.sql').resolve()) + run_script(['psql', '-d', self.api_test_db, '-f', phrase_file]) + except: + self.db_drop_database(self.api_test_db) + raise + + def setup_unknown_db(self): """ Setup a test against a non-existing database. """ @@ -179,6 +211,7 @@ class NominatimEnvironment: cur.execute('CREATE DATABASE {} TEMPLATE = {}'.format(self.test_db, self.template_db)) conn.close() context.db = self.connect_database(self.test_db) + context.db.autocommit = True psycopg2.extras.register_hstore(context.db, globally=False) def teardown_db(self, context): @@ -190,6 +223,52 @@ class NominatimEnvironment: if not self.keep_scenario_db: self.db_drop_database(self.test_db) + def _reuse_or_drop_db(self, name): + """ Check for the existance of the given DB. If reuse is enabled, + then the function checks for existance and returns True if the + database is already there. Otherwise an existing database is + dropped and always false returned. + """ + if self.reuse_template: + conn = self.connect_database('postgres') + with conn.cursor() as cur: + cur.execute('select count(*) from pg_database where datname = %s', + (name,)) + if cur.fetchone()[0] == 1: + return True + conn.close() + else: + self.db_drop_database(name) + + return False + + def reindex_placex(self, db): + """ Run the indexing step until all data in the placex has + been processed. Indexing during updates can produce more data + to index under some circumstances. That is why indexing may have + to be run multiple times. + """ + with db.cursor() as cur: + while True: + self.run_nominatim('index') + + cur.execute("SELECT 'a' FROM placex WHERE indexed_status != 0 LIMIT 1") + if cur.rowcount == 0: + return + + def run_nominatim(self, *cmdline): + """ Run the nominatim command-line tool via the library. + """ + cli.nominatim(module_dir='', + osm2pgsql_path=str(self.build_dir / 'osm2pgsql' / 'osm2pgsql'), + phplib_dir=str(self.src_dir / 'lib-php'), + sqllib_dir=str(self.src_dir / 'lib-sql'), + data_dir=str(self.src_dir / 'data'), + config_dir=str(self.src_dir / 'settings'), + cli_args=cmdline, + phpcgi_path='', + environ=self.test_env) + def run_setup_script(self, *args, **kwargs): """ Run the Nominatim setup script with the given arguments. """ @@ -204,7 +283,7 @@ class NominatimEnvironment: """ Run one of the Nominatim utility scripts with the given arguments. """ cmd = ['/usr/bin/env', 'php', '-Cq'] - cmd.append((Path(self.build_dir) / 'utils' / '{}.php'.format(script)).resolve()) + cmd.append((Path(self.src_dir) / 'lib-php' / 'admin' / '{}.php'.format(script)).resolve()) cmd.extend(['--' + x for x in args]) for k, v in kwargs.items(): cmd.extend(('--' + k.replace('_', '-'), str(v))) @@ -212,6 +291,28 @@ class NominatimEnvironment: if self.website_dir is not None: cwd = self.website_dir.name else: - cwd = self.build_dir + cwd = None run_script(cmd, cwd=cwd, env=self.test_env) + + def copy_from_place(self, db): + """ Copy data from place to the placex and location_property_osmline + tables invoking the appropriate triggers. + """ + self.run_nominatim('refresh', '--functions', '--no-diff-updates') + + with db.cursor() as cur: + cur.execute("""INSERT INTO placex (osm_type, osm_id, class, type, + name, admin_level, address, + extratags, geometry) + SELECT osm_type, osm_id, class, type, + name, admin_level, address, + extratags, geometry + FROM place + WHERE not (class='place' and type='houses' and osm_type='W')""") + cur.execute("""INSERT INTO location_property_osmline (osm_id, address, linegeo) + SELECT osm_id, address, geometry + FROM place + WHERE class='place' and type='houses' + and osm_type='W' + and ST_GeometryType(geometry) = 'ST_LineString'""")