Merge remote-tracking branch 'upstream/master'

[nominatim.git] / test / bdd / steps / queries.py

diff --git a/test/bdd/steps/queries.py b/test/bdd/steps/queries.py
index 7266be55913fc3cff9962819e4cf781b725de823..caefb661487692a45c6fb8d2930496eb2ebfb911 100644 (file)
--- a/test/bdd/steps/queries.py
+++ b/test/bdd/steps/queries.py
@@ -321,12 +321,15 @@ def send_api_query(endpoint, params, fmt, context):
 
     (outp, err) = proc.communicate()
     outp = outp.decode('utf-8')
 
     (outp, err) = proc.communicate()
     outp = outp.decode('utf-8')

+    err = err.decode("utf-8")

 
     logger.debug("Result: \n===============================\n"
                  + outp + "\n===============================\n")
 
     assert_equals(0, proc.returncode,
 
     logger.debug("Result: \n===============================\n"
                  + outp + "\n===============================\n")
 
     assert_equals(0, proc.returncode,

-                  "%s failed with message: %s\noutput: %s" % (env['SCRIPT_FILENAME'], err, outp))
+                  "%s failed with message: %s" % (
+                      os.path.basename(env['SCRIPT_FILENAME']),
+                      err))

 
     assert_equals(0, len(err), "Unexpected PHP error: %s" % (err))
 
 
     assert_equals(0, len(err), "Unexpected PHP error: %s" % (err))