X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/4ca71978269ba00c687481b90fad621758219b98..4aba70caeef6f574e59ad05972ac4981d07ea26d:/test/bdd/steps/queries.py diff --git a/test/bdd/steps/queries.py b/test/bdd/steps/queries.py index a2fe0247..0ea4685b 100644 --- a/test/bdd/steps/queries.py +++ b/test/bdd/steps/queries.py @@ -302,10 +302,9 @@ def send_api_query(endpoint, params, fmt, context): env['SCRIPT_NAME'] = '/%s.php' % endpoint env['REQUEST_URI'] = '%s?%s' % (env['SCRIPT_NAME'], env['QUERY_STRING']) - env['CONTEXT_DOCUMENT_ROOT'] = os.path.join(context.nominatim.build_dir, 'website') + env['CONTEXT_DOCUMENT_ROOT'] = os.path.join(context.nominatim.website_dir.name, 'website') env['SCRIPT_FILENAME'] = os.path.join(env['CONTEXT_DOCUMENT_ROOT'], '%s.php' % endpoint) - env['NOMINATIM_SETTINGS'] = context.nominatim.local_settings_file logger.debug("Environment:" + json.dumps(env, sort_keys=True, indent=2)) @@ -327,7 +326,7 @@ def send_api_query(endpoint, params, fmt, context): for k,v in params.items(): cmd.append("%s=%s" % (k, v)) - proc = subprocess.Popen(cmd, cwd=context.nominatim.build_dir, env=env, + proc = subprocess.Popen(cmd, cwd=context.nominatim.website_dir.name, env=env, stdout=subprocess.PIPE, stderr=subprocess.PIPE) (outp, err) = proc.communicate()