Merge pull request #776 from lonvia/vagrant-fix-country-paths

[nominatim.git] / test / bdd / environment.py

diff --git a/test/bdd/environment.py b/test/bdd/environment.py
index a954b2533010f283ef4a128a2687bb81ff49a95d..6f50817a96d97a930380ce5c5f3bf91770ec4ac8 100644 (file)
--- a/test/bdd/environment.py
+++ b/test/bdd/environment.py
@@ -4,19 +4,21 @@ import os
 import psycopg2
 import psycopg2.extras
 import subprocess
 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 = {
 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',
     '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")
 }
 
 use_step_matcher("re")


@@ -27,18 +29,29 @@ class NominatimEnvironment(object):
 
     def __init__(self, config):
         self.build_dir = os.path.abspath(config['BUILDDIR'])
 
     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.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.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
 
         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("<?php\n  @define('CONST_Database_DSN', 'pgsql://@/%s');\n" % dbname)
     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()
 
     def cleanup(self):
         f.close()
 
     def cleanup(self):


@@ -86,19 +99,23 @@ class NominatimEnvironment(object):
         conn.commit()
         conn.close()
 
         conn.commit()
         conn.close()
 

-        # execute osm2pgsql on an empty file to get the right tables
-        osm2pgsql = os.path.join(self.build_dir, 'osm2pgsql', 'osm2pgsql')
-        proc = subprocess.Popen([osm2pgsql, '-lsc', '-r', 'xml',
-                                 '-O', 'gazetteer', '-d', self.template_db, '-'],
-                                cwd=self.build_dir, stdin=subprocess.PIPE,
-                                stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        [outstr, errstr] = proc.communicate(input=b'<osm version="0.6"></osm>')
-        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'<osm version="0.6"></osm>')
+            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()
 
     def setup_db(self, context):
         self.setup_template_db()


@@ -122,12 +139,17 @@ class NominatimEnvironment(object):
         if not self.keep_scenario_db:
             self.db_drop_database(self.test_db)
 
         if not self.keep_scenario_db:
             self.db_drop_database(self.test_db)
 

-    def run_setup_script(self, *args):
-        self.run_nominatim_script('setup', *args)
+    def run_setup_script(self, *args, **kwargs):
+        self.run_nominatim_script('setup', *args, **kwargs)
+
+    def run_update_script(self, *args, **kwargs):
+        self.run_nominatim_script('update', *args, **kwargs)

 
 

-    def run_nominatim_script(self, script, *args):
+    def run_nominatim_script(self, script, *args, **kwargs):

         cmd = [os.path.join(self.build_dir, 'utils', '%s.php' % script)]
         cmd.extend(['--%s' % x for x in args])
         cmd = [os.path.join(self.build_dir, 'utils', '%s.php' % script)]
         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,
                                 stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         (outp, outerr) = proc.communicate()
         proc = subprocess.Popen(cmd, cwd=self.build_dir,
                                 stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         (outp, outerr) = proc.communicate()


@@ -142,18 +164,32 @@ class OSMDataFactory(object):
         self.scene_path = os.environ.get('SCENE_PATH',
                            os.path.join(scriptpath, '..', 'scenes', 'data'))
         self.scene_cache = {}
         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:
 
     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:
         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:
         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'::geometry, 4326)" % out

 
 

-        return "ST_SetSRID(%s, 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 = []
 
     def get_scene_geometry(self, default_scene, name):
         geoms = []


@@ -189,6 +225,15 @@ class OSMDataFactory(object):
 
         return scene
 
 
         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
 
 def before_all(context):
     # logging setup


@@ -208,6 +253,8 @@ def after_all(context):
 def before_scenario(context, scenario):
     if 'DB' in context.tags:
         context.nominatim.setup_db(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):
     context.scene = None
 
 def after_scenario(context, scenario):