add osm2pgsql broken data tests

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

diff --git a/test/bdd/environment.py b/test/bdd/environment.py
index a954b2533010f283ef4a128a2687bb81ff49a95d..29c6675c9df0de34897e684b496e6695021e1c43 100644 (file)
--- a/test/bdd/environment.py
+++ b/test/bdd/environment.py
@@ -122,12 +122,17 @@ class NominatimEnvironment(object):
         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_nominatim_script(self, script, *args):
+    def run_update_script(self, *args):
+        self.run_nominatim_script('update', *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])
+        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()