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 52b7e31e4e3d6f02ce7f7178e23717e327925c25..746485ac14b4bfb961e2e4d2274cf31cff2d9b04 100644 (file)
--- a/tests/steps/terrain.py
+++ b/tests/steps/terrain.py
@@ -23,11 +23,11 @@ class NominatimConfig:
             logging.basicConfig(level=loglevel)
         # Nominatim test setup
         self.base_url = os.environ.get('NOMINATIM_SERVER', 'http://localhost/nominatim')
-        self.source_dir = os.path.abspath(os.environ.get('NOMINATIM_DIR', '../Nominatim'))
+        self.source_dir = os.path.abspath(os.environ.get('NOMINATIM_DIR', '..'))
         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'