X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/2755ebe88360c56f9e82c5b910362ac402cc1ed0..8f30a32466c36d5a989e7f754df315cbd9314126:/test/bdd/steps/steps_api_queries.py diff --git a/test/bdd/steps/steps_api_queries.py b/test/bdd/steps/steps_api_queries.py index 3d3b16c7..93501e42 100644 --- a/test/bdd/steps/steps_api_queries.py +++ b/test/bdd/steps/steps_api_queries.py @@ -114,18 +114,7 @@ def send_api_query_php(endpoint, params, context): for k, v in context.http_headers.items(): env['HTTP_' + k.upper().replace('-', '_')] = v - cmd = ['/usr/bin/env', 'php-cgi', '-f'] - if context.nominatim.code_coverage_path: - env['XDEBUG_MODE'] = 'coverage' - env['COV_SCRIPT_FILENAME'] = env['SCRIPT_FILENAME'] - env['COV_PHP_DIR'] = context.nominatim.src_dir - env['COV_TEST_NAME'] = f"{context.scenario.filename}:{context.scenario.line}" - env['SCRIPT_FILENAME'] = \ - os.path.join(os.path.split(__file__)[0], 'cgi-with-coverage.php') - cmd.append(env['SCRIPT_FILENAME']) - env['PHP_CODE_COVERAGE_FILE'] = context.nominatim.next_code_coverage_file() - else: - cmd.append(env['SCRIPT_FILENAME']) + cmd = ['/usr/bin/env', 'php-cgi', '-f', env['SCRIPT_FILENAME']] for k,v in params.items(): cmd.append(f"{k}={v}") @@ -243,7 +232,7 @@ def step_impl(context, fmt): try: tree = ET.fromstring(context.response.page) except Exception as ex: - assert False, f"Could not parse page:\n{context.response.page}" + assert False, f"Could not parse page: {ex}\n{context.response.page}" assert tree.tag == 'html' body = tree.find('./body')