Skip to content

Commit 877215f

Browse files
committed
missing envs
1 parent f17b2c3 commit 877215f

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

.env-devel

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,11 +274,12 @@ VENDOR_DEV_MANUAL_SUBDOMAIN=manual
274274
WB_API_WEBSERVER_HOST=wb-api-server
275275
WB_API_WEBSERVER_PORT=8080
276276

277-
WB_AUTH_WEBSERVER_HOST=wb-auth
278-
WB_AUTH_WEBSERVER_PORT=8080
277+
WB_AUTH_DIAGNOSTICS={}
279278
WB_AUTH_LOGLEVEL=INFO
280279
WB_AUTH_PROFILING=1
281280
WB_AUTH_TRACING={}
281+
WB_AUTH_WEBSERVER_HOST=wb-auth
282+
WB_AUTH_WEBSERVER_PORT=8080
282283

283284
WB_GC_ACTIVITY=null
284285
WB_GC_ANNOUNCEMENTS=0

services/web/server/tests/unit/with_dbs/03/test_login_auth_app.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,19 @@ def app_environment_for_wb_authz_service_dict(
4242

4343
postgres_cfg = default_app_cfg["db"]["postgres"]
4444

45+
# Checks that docker-compose service environment is correct
4546
assert (
4647
docker_compose_service_environment_dict["WEBSERVER_APP_FACTORY_NAME"]
4748
== "WEBSERVER_AUTHZ_APP_FACTORY"
4849
)
49-
5050
# expected tracing in the docker-environ BUT we will disable it for tests
5151
assert "WEBSERVER_TRACING" in docker_compose_service_environment_dict
5252
assert (
5353
"TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT"
5454
in docker_compose_service_environment_dict
5555
)
56+
assert "WEBSERVER_DIAGNOSTICS" in docker_compose_service_environment_dict
57+
assert "WEBSERVER_PROFILING" in docker_compose_service_environment_dict
5658

5759
return {
5860
**docker_compose_service_environment_dict,
@@ -121,7 +123,7 @@ async def wb_auth_app(
121123
@pytest_asyncio.fixture(loop_scope="function", scope="function")
122124
async def web_server(
123125
postgres_db: sa.engine.Engine, # sets up postgres database
124-
auth_app: web.Application,
126+
wb_auth_app: web.Application,
125127
webserver_test_server_port: int,
126128
# tools
127129
aiohttp_server: Callable,
@@ -141,10 +143,10 @@ async def test_logout(request: web.Request) -> web.Response:
141143
await security_web.forget_identity(request, response)
142144
return response
143145

144-
auth_app.router.add_post("/v0/test/login", test_login)
145-
auth_app.router.add_post("/v0/test/logout", test_logout)
146+
wb_auth_app.router.add_post("/v0/test/login", test_login)
147+
wb_auth_app.router.add_post("/v0/test/logout", test_logout)
146148

147-
return await aiohttp_server(auth_app, port=webserver_test_server_port)
149+
return await aiohttp_server(wb_auth_app, port=webserver_test_server_port)
148150

149151

150152
# @pytest.mark.parametrize(

0 commit comments

Comments
 (0)