X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/75f951d254127d8857b6ad95cac241917f88e542..84ea0753d8d7861ff6a47a6eb29f072a1d342879:/test/bdd/environment.py diff --git a/test/bdd/environment.py b/test/bdd/environment.py index 02d09824..f0658c33 100644 --- a/test/bdd/environment.py +++ b/test/bdd/environment.py @@ -82,6 +82,7 @@ class NominatimEnvironment(object): (';password=' + self.db_pass) if self.db_pass else '' )) f.write("@define('CONST_Osm2pgsql_Flatnode_File', null);\n") + f.write("@define('CONST_Import_Style', CONST_BasePath.'/settings/import-full.style');\n") f.close() def cleanup(self): @@ -195,6 +196,7 @@ class NominatimEnvironment(object): proc = subprocess.Popen(cmd, cwd=self.build_dir, stdout=subprocess.PIPE, stderr=subprocess.PIPE) (outp, outerr) = proc.communicate() + outerr = outerr.decode('utf-8').replace('\\n', '\n') logger.debug("run_nominatim_script: %s\n%s\n%s" % (cmd, outp, outerr)) assert (proc.returncode == 0), "Script '%s' failed:\n%s\n%s\n" % (script, outp, outerr)