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__)
'BUILDDIR' : os.path.join(os.path.split(__file__)[0], "../../build"),
'REMOVE_TEMPLATE' : False,
'KEEP_TEST_DB' : False,
+ 'DB_HOST' : None,
+ 'DB_PORT' : None,
+ 'DB_USER' : None,
+ 'DB_PASS' : None,
'TEMPLATE_DB' : 'test_template_nominatim',
'TEST_DB' : 'test_nominatim',
'API_TEST_DB' : 'test_api_nominatim',
- 'TEST_SETTINGS_FILE' : '/tmp/nominatim_settings.php',
+ 'SERVER_MODULE_PATH' : None,
'PHPCOV' : False, # set to output directory to enable code coverage
}
use_step_matcher("re")
+
class NominatimEnvironment(object):
""" Collects all functions for the execution of Nominatim functions.
"""
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.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']
self.test_db = config['TEST_DB']
self.api_test_db = config['API_TEST_DB']
- self.local_settings_file = config['TEST_SETTINGS_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
- os.environ['NOMINATIM_SETTINGS'] = self.local_settings_file
+ self.test_env = None
self.template_db_done = False
+ self.website_dir = None
+
+ def connect_database(self, dbname):
+ 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:
+ dbargs['password'] = self.db_pass
+ conn = psycopg2.connect(**dbargs)
+ return conn
def next_code_coverage_file(self):
fn = os.path.join(self.code_coverage_path, "%06d.cov" % self.code_coverage_id)
return fn
def write_nominatim_config(self, dbname):
- f = open(self.local_settings_file, 'w')
- f.write("<?php\n @define('CONST_Database_DSN', 'pgsql://@/%s');\n" % dbname)
- f.write("@define('CONST_Osm2pgsql_Flatnode_File', null);\n")
- f.close()
+ 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 ''
+ )
+
+ if self.website_dir is not None \
+ and self.test_env is not None \
+ and dsn == self.test_env['NOMINATIM_DATABASE_DSN']:
+ return # environment already set uo
+
+ 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'
+
+ if self.website_dir is not None:
+ self.website_dir.cleanup()
+
+ self.website_dir = tempfile.TemporaryDirectory()
+ self.run_setup_script('setup-website')
- def cleanup(self):
- try:
- os.remove(self.local_settings_file)
- except OSError:
- pass # ignore missing file
def db_drop_database(self, name):
- conn = psycopg2.connect(database='postgres')
+ conn = self.connect_database('postgres')
conn.set_isolation_level(0)
cur = conn.cursor()
cur.execute('DROP DATABASE IF EXISTS %s' % (name, ))
if self.reuse_template:
# check that the template is there
- conn = psycopg2.connect(database='postgres')
+ conn = self.connect_database('postgres')
cur = conn.cursor()
cur.execute('select count(*) from pg_database where datname = %s',
(self.template_db,))
self.write_nominatim_config(self.template_db)
self.run_setup_script('create-db', 'setup-db')
# remove external data to speed up indexing for tests
- conn = psycopg2.connect(database=self.template_db)
+ conn = self.connect_database(self.template_db)
cur = conn.cursor()
cur.execute("""select tablename from pg_tables
where tablename in ('gb_postcode', 'us_postcode')""")
def setup_db(self, context):
self.setup_template_db()
self.write_nominatim_config(self.test_db)
- conn = psycopg2.connect(database=self.template_db)
+ conn = self.connect_database(self.template_db)
conn.set_isolation_level(0)
cur = conn.cursor()
cur.execute('DROP DATABASE IF EXISTS %s' % (self.test_db, ))
cur.execute('CREATE DATABASE %s TEMPLATE = %s' % (self.test_db, self.template_db))
conn.close()
- context.db = psycopg2.connect(database=self.test_db)
+ context.db = self.connect_database(self.test_db)
if python_version[0] < 3:
psycopg2.extras.register_hstore(context.db, globally=False, unicode=True)
else:
self.db_drop_database(self.test_db)
def run_setup_script(self, *args, **kwargs):
+ if self.server_module_path:
+ kwargs = dict(kwargs)
+ kwargs['module_path'] = self.server_module_path
self.run_nominatim_script('setup', *args, **kwargs)
def run_update_script(self, *args, **kwargs):
cmd.extend(['--%s' % x for x in args])
for k, v in kwargs.items():
cmd.extend(('--' + k.replace('_', '-'), str(v)))
- proc = subprocess.Popen(cmd, cwd=self.build_dir,
+
+ if self.website_dir is not None:
+ cwd = self.website_dir.name
+ else:
+ cwd = self.build_dir
+
+ proc = subprocess.Popen(cmd, cwd=cwd, env=self.test_env,
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
(outp, outerr) = proc.communicate()
+ outerr = outerr.decode('utf-8').replace('\\n', '\n')
logger.debug("run_nominatim_script: %s\n%s\n%s" % (cmd, outp, outerr))
assert (proc.returncode == 0), "Script '%s' failed:\n%s\n%s\n" % (script, outp, outerr)
return geom
else:
pt = self.grid_node(int(geom))
- assert_is_not_none(pt, "Point not found in grid")
+ assert pt is not None, "Bad scenario: Point '{}' not found in grid".format(geom)
return "%f %f" % pt
def get_scene_geometry(self, default_scene, name):
for obj in name.split('+'):
oname = obj.strip()
if oname.startswith(':'):
- assert_is_not_none(default_scene, "You need to set a scene")
+ assert default_scene is not None, "Bad scenario: You need to set a scene"
defscene = self.load_scene(default_scene)
wkt = defscene[oname[1:]]
else:
context.nominatim = NominatimEnvironment(context.config.userdata)
context.osm = OSMDataFactory()
-def after_all(context):
- context.nominatim.cleanup()
-
def before_scenario(context, scenario):
if 'DB' in context.tags:
def after_scenario(context, scenario):
if 'DB' in context.tags:
context.nominatim.teardown_db(context)
-
projects / nominatim.git / blobdiff