X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/a4e514033df5fbe3f494d757892589772a690cce..4aba70caeef6f574e59ad05972ac4981d07ea26d:/test/bdd/environment.py

diff --git a/test/bdd/environment.py b/test/bdd/environment.py
index f0658c33..0ac92104 100644
--- a/test/bdd/environment.py
+++ b/test/bdd/environment.py
@@ -5,7 +5,6 @@ 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__)
@@ -21,13 +20,13 @@ userconfig = {
     '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.
     """
@@ -43,14 +42,14 @@ class NominatimEnvironment(object):
         self.test_db = config['TEST_DB']
         self.api_test_db = config['API_TEST_DB']
         self.server_module_path = config['SERVER_MODULE_PATH']
-        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.test_env = None
 
         self.template_db_done = False
+        self.website_dir = None
 
     def connect_database(self, dbname):
         dbargs = {'database': dbname}
@@ -72,24 +71,31 @@ class NominatimEnvironment(object):
         return fn
 
     def write_nominatim_config(self, dbname):
-        f = open(self.local_settings_file, 'w')
-        # https://secure.php.net/manual/en/ref.pdo-pgsql.connection.php
-        f.write("<?php\n  @define('CONST_Database_DSN', 'pgsql:dbname=%s%s%s%s%s');\n" %
-                (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 ''
-                 ))
-        f.write("@define('CONST_Osm2pgsql_Flatnode_File', null);\n")
-        f.write("@define('CONST_Import_Style', CONST_BasePath.'/settings/import-full.style');\n")
-        f.close()
+                 )
+
+        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 = self.connect_database('postgres')
@@ -193,7 +199,13 @@ class NominatimEnvironment(object):
         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')
@@ -232,7 +244,7 @@ class OSMDataFactory(object):
             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):
@@ -240,7 +252,7 @@ class OSMDataFactory(object):
         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:
@@ -290,9 +302,6 @@ def before_all(context):
     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: