X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/7219ee653276359d4485ff8b89e1841e42af71c5..e1af6a22d357de51c86ac73582beba2b4419227b:/test/bdd/steps/nominatim_environment.py diff --git a/test/bdd/steps/nominatim_environment.py b/test/bdd/steps/nominatim_environment.py index 158b7974..64b62aba 100644 --- a/test/bdd/steps/nominatim_environment.py +++ b/test/bdd/steps/nominatim_environment.py @@ -9,9 +9,6 @@ import importlib import sys import tempfile -from asgi_lifespan import LifespanManager -import httpx - import psycopg2 import psycopg2.extras @@ -337,13 +334,16 @@ class NominatimEnvironment: def create_api_request_func_starlette(self): import nominatim.server.starlette.server + from asgi_lifespan import LifespanManager + import httpx - async def _request(endpoint, params, project_dir, environ): + async def _request(endpoint, params, project_dir, environ, http_headers): app = nominatim.server.starlette.server.get_application(project_dir, environ) async with LifespanManager(app): async with httpx.AsyncClient(app=app, base_url="http://nominatim.test") as client: - response = await client.get(f"/{endpoint}", params=params) + response = await client.get(f"/{endpoint}", params=params, + headers=http_headers) return response.text, response.status_code @@ -353,10 +353,11 @@ class NominatimEnvironment: def create_api_request_func_sanic(self): import nominatim.server.sanic.server - async def _request(endpoint, params, project_dir, environ): + async def _request(endpoint, params, project_dir, environ, http_headers): app = nominatim.server.sanic.server.get_application(project_dir, environ) - _, response = await app.asgi_client.get(f"/{endpoint}", params=params) + _, response = await app.asgi_client.get(f"/{endpoint}", params=params, + headers=http_headers) return response.text, response.status_code @@ -367,11 +368,12 @@ class NominatimEnvironment: import nominatim.server.falcon.server import falcon.testing - async def _request(endpoint, params, project_dir, environ): + async def _request(endpoint, params, project_dir, environ, http_headers): app = nominatim.server.falcon.server.get_application(project_dir, environ) async with falcon.testing.ASGIConductor(app) as conductor: - response = await conductor.get(f"/{endpoint}", params=params) + response = await conductor.get(f"/{endpoint}", params=params, + headers=http_headers) return response.text, response.status_code