Merge remote-tracking branch 'upstream/master'

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

diff --git a/test/bdd/steps/nominatim_environment.py b/test/bdd/steps/nominatim_environment.py
index e156c60c37aef808fccf0ab1165c10b1b35f481b..64b62abaa88dc5ba0757e0130454534e339a4d4f 100644 (file)
--- a/test/bdd/steps/nominatim_environment.py
+++ b/test/bdd/steps/nominatim_environment.py
@@ -337,12 +337,13 @@ class NominatimEnvironment:
         from asgi_lifespan import LifespanManager
         import httpx
 
         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:
             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
 
 
             return response.text, response.status_code
 


@@ -352,10 +353,11 @@ class NominatimEnvironment:
     def create_api_request_func_sanic(self):
         import nominatim.server.sanic.server
 
     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)
 
             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
 
 
             return response.text, response.status_code
 


@@ -366,11 +368,12 @@ class NominatimEnvironment:
         import nominatim.server.falcon.server
         import falcon.testing
 
         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:
             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
 
 
             return response.text, response.status_code