X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/f2debbef199337c98bbd21a29203da7378067ec9..760807c5e04c427d8df616991b18c78f72a10b04:/test/bdd/environment.py diff --git a/test/bdd/environment.py b/test/bdd/environment.py index 29c6675c..6f50817a 100644 --- a/test/bdd/environment.py +++ b/test/bdd/environment.py @@ -4,19 +4,21 @@ import os import psycopg2 import psycopg2.extras import subprocess +import tempfile from nose.tools import * # for assert functions 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', - 'TEST_SETTINGS_FILE' : '/tmp/nominatim_settings.php' + 'API_TEST_DB' : 'test_api_nominatim', + 'TEST_SETTINGS_FILE' : '/tmp/nominatim_settings.php', + 'PHPCOV' : False, # set to output directory to enable code coverage } use_step_matcher("re") @@ -27,18 +29,29 @@ class NominatimEnvironment(object): def __init__(self, config): self.build_dir = os.path.abspath(config['BUILDDIR']) + self.src_dir = os.path.abspath(os.path.join(os.path.split(__file__)[0], "../..")) 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'] + self.code_coverage_path = config['PHPCOV'] + self.code_coverage_id = 1 os.environ['NOMINATIM_SETTINGS'] = self.local_settings_file self.template_db_done = False + def next_code_coverage_file(self): + fn = os.path.join(self.code_coverage_path, "%06d.cov" % self.code_coverage_id) + self.code_coverage_id += 1 + + return fn + def write_nominatim_config(self, dbname): f = open(self.local_settings_file, 'w') f.write("') - logger.debug("running osm2pgsql for template: %s\n%s\n%s" % (osm2pgsql, outstr, errstr)) - self.run_setup_script('create-functions', 'create-tables', - 'create-partition-tables', 'create-partition-functions', - 'load-data', 'create-search-indices') - - + # execute osm2pgsql import on an empty file to get the right tables + with tempfile.NamedTemporaryFile(dir='/tmp', suffix='.xml') as fd: + fd.write(b'') + fd.flush() + self.run_setup_script('import-data', + 'ignore-errors', + 'create-functions', + 'create-tables', + 'create-partition-tables', + 'create-partition-functions', + 'load-data', + 'create-search-indices', + osm_file=fd.name, + osm2pgsql_cache='200') + + 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 +142,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)] @@ -147,18 +164,32 @@ class OSMDataFactory(object): self.scene_path = os.environ.get('SCENE_PATH', os.path.join(scriptpath, '..', 'scenes', 'data')) self.scene_cache = {} + self.clear_grid() def parse_geometry(self, geom, scene): if geom.find(':') >= 0: - out = self.get_scene_geometry(scene, geom) - elif geom.find(',') < 0: - out = "'POINT(%s)'::geometry" % geom + return "ST_SetSRID(%s, 4326)" % self.get_scene_geometry(scene, geom) + + if geom.find(',') < 0: + out = "POINT(%s)" % self.mk_wkt_point(geom) elif geom.find('(') < 0: - out = "'LINESTRING(%s)'::geometry" % geom + line = ','.join([self.mk_wkt_point(x) for x in geom.split(',')]) + out = "LINESTRING(%s)" % line else: - out = "'POLYGON(%s)'::geometry" % geom + inner = geom.strip('() ') + line = ','.join([self.mk_wkt_point(x) for x in inner.split(',')]) + out = "POLYGON((%s))" % line - return "ST_SetSRID(%s, 4326)" % out + return "ST_SetSRID('%s'::geometry, 4326)" % out + + def mk_wkt_point(self, point): + geom = point.strip() + if geom.find(' ') >= 0: + return geom + else: + pt = self.grid_node(int(geom)) + assert_is_not_none(pt, "Point not found in grid") + return "%f %f" % pt def get_scene_geometry(self, default_scene, name): geoms = [] @@ -194,6 +225,15 @@ class OSMDataFactory(object): return scene + def clear_grid(self): + self.grid = {} + + def add_grid_node(self, nodeid, x, y): + self.grid[nodeid] = (x, y) + + def grid_node(self, nodeid): + return self.grid.get(nodeid) + def before_all(context): # logging setup @@ -213,6 +253,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):