Merge remote-tracking branch 'upstream/master'

[nominatim.git] / tests / steps / terrain.py

diff --git a/tests/steps/terrain.py b/tests/steps/terrain.py
index cfd243db4cada7443f5b1ee031e09cd2e0d17f97..e9561d1a9fd11b52653f8d383d7f5d9eb8872785 100644 (file)
--- a/tests/steps/terrain.py
+++ b/tests/steps/terrain.py
@@ -27,7 +27,7 @@ class NominatimConfig:
         self.template_db = os.environ.get('TEMPLATE_DB', 'test_template_nominatim')
         self.test_db = os.environ.get('TEST_DB', 'test_nominatim')
         self.local_settings_file = os.environ.get('NOMINATIM_SETTINGS', '/tmp/nominatim_settings.php')
         self.template_db = os.environ.get('TEMPLATE_DB', 'test_template_nominatim')
         self.test_db = os.environ.get('TEST_DB', 'test_nominatim')
         self.local_settings_file = os.environ.get('NOMINATIM_SETTINGS', '/tmp/nominatim_settings.php')

-        self.reuse_template = 'NOMINATIM_REUSE_TEMPLATE' in os.environ
+        self.reuse_template = 'NOMINATIM_REMOVE_TEMPLATE' not in os.environ

         self.keep_scenario_db = 'NOMINATIM_KEEP_SCENARIO_DB' in os.environ
         os.environ['NOMINATIM_SETTINGS'] = '/tmp/nominatim_settings.php'
 
         self.keep_scenario_db = 'NOMINATIM_KEEP_SCENARIO_DB' in os.environ
         os.environ['NOMINATIM_SETTINGS'] = '/tmp/nominatim_settings.php'
 


@@ -94,7 +94,7 @@ def get_placeid(oid):
         q = 'SELECT place_id FROM placex where osm_type = %s and osm_id = %s and class = %s'
         params = (osmtype, osmid, cls)
     cur.execute(q, params)
         q = 'SELECT place_id FROM placex where osm_type = %s and osm_id = %s and class = %s'
         params = (osmtype, osmid, cls)
     cur.execute(q, params)

-    assert_equals (cur.rowcount, 1)
+    assert_equals(cur.rowcount, 1, "%d rows found for place %s" % (cur.rowcount, oid))

     return cur.fetchone()[0]
 
 
     return cur.fetchone()[0]