enable test execution using ctest

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

diff --git a/tests/steps/db_setup.py b/tests/steps/db_setup.py
index 14f17756b2a54d98648995fb3f7875a35ff69a46..8041c6cc6070ad49791a5eb8c0a022a046256e9e 100644 (file)
--- a/tests/steps/db_setup.py
+++ b/tests/steps/db_setup.py
@@ -95,6 +95,9 @@ def _format_placex_cols(cols, geomtype, force_name):
         else:
             coords = "'%s'::geometry" % coords.wkt
         cols['geometry'] = coords
+    for k in cols:
+        if not cols[k]:
+            cols[k] = None
 
 
 def _insert_place_table_nodes(places, force_name):
@@ -263,7 +266,8 @@ def query_cmd(step, query, with_dups):
            '--search', query]
     if with_dups is not None:
         cmd.append('--nodedupe')
-    proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    proc = subprocess.Popen(cmd, cwd=world.config.source_dir,
+                            stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     (outp, err) = proc.communicate()
     assert (proc.returncode == 0), "query.php failed with message: %s" % err
     world.page = outp