X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/b2be8c3ab7baca371ae2d2f65555e0a5ca09f531..78d5b63e38b1165a22f27a5255e0c0d63d6464cb:/test/bdd/steps/queries.py?ds=sidebyside diff --git a/test/bdd/steps/queries.py b/test/bdd/steps/queries.py index c429f082..55285d6a 100644 --- a/test/bdd/steps/queries.py +++ b/test/bdd/steps/queries.py @@ -8,6 +8,7 @@ import json import os import io import re +import logging from tidylib import tidy_document import xml.etree.ElementTree as ET import subprocess @@ -15,6 +16,8 @@ from urllib.parse import urlencode from collections import OrderedDict from nose.tools import * # for assert functions +logger = logging.getLogger(__name__) + BASE_SERVER_ENV = { 'HTTP_HOST' : 'localhost', 'HTTP_USER_AGENT' : 'Mozilla/5.0 (X11; Linux x86_64; rv:51.0) Gecko/20100101 Firefox/51.0', @@ -274,6 +277,8 @@ def send_api_query(endpoint, params, fmt, context): '%s.php' % endpoint) env['NOMINATIM_SETTINGS'] = context.nominatim.local_settings_file + logger.debug("Environment:" + json.dumps(env, sort_keys=True, indent=2)) + if hasattr(context, 'http_headers'): env.update(context.http_headers) @@ -285,14 +290,16 @@ def send_api_query(endpoint, params, fmt, context): stdout=subprocess.PIPE, stderr=subprocess.PIPE) (outp, err) = proc.communicate() + outp = outp.decode('utf-8') + + logger.debug("Result: \n===============================\n" + + outp + "\n===============================\n") assert_equals(0, proc.returncode, "query.php failed with message: %s\noutput: %s" % (err, outp)) assert_equals(0, len(err), "Unexpected PHP error: %s" % (err)) - outp = outp.decode('utf-8') - if outp.startswith('Status: '): status = int(outp[8:11]) else: