Merge pull request 'Return not-ready for invalid Gitea current-user payload' (#78) from timmy/77-return-not-ready-invalid-current-user into main
This commit is contained in:
commit
89b14872e6
|
|
@ -43,6 +43,8 @@ async def readiness():
|
||||||
user = await asyncio.wait_for(
|
user = await asyncio.wait_for(
|
||||||
current_user(), timeout=READINESS_TIMEOUT_SECONDS
|
current_user(), timeout=READINESS_TIMEOUT_SECONDS
|
||||||
)
|
)
|
||||||
|
if not isinstance(user, dict) or not user.get("login"):
|
||||||
|
raise ValueError("Gitea current-user response did not include a login")
|
||||||
except Exception as exc:
|
except Exception as exc:
|
||||||
timed_out = isinstance(exc, TimeoutError)
|
timed_out = isinstance(exc, TimeoutError)
|
||||||
error_message = (
|
error_message = (
|
||||||
|
|
|
||||||
|
|
@ -42,6 +42,23 @@ async def test_readiness_endpoint_returns_503_when_gitea_is_unavailable(monkeypa
|
||||||
assert b'"error":"connection refused"' in response.body
|
assert b'"error":"connection refused"' in response.body
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.anyio
|
||||||
|
async def test_readiness_endpoint_returns_503_for_null_current_user_payload(monkeypatch):
|
||||||
|
async def null_user():
|
||||||
|
return None
|
||||||
|
|
||||||
|
monkeypatch.setattr(main, "current_user", null_user)
|
||||||
|
|
||||||
|
response = await main.readiness()
|
||||||
|
|
||||||
|
assert response.status_code == 503
|
||||||
|
assert json.loads(response.body) == {
|
||||||
|
"status": "not_ready",
|
||||||
|
"service": "stackchain-dashboard",
|
||||||
|
"error": "Gitea current-user response did not include a login",
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.anyio
|
@pytest.mark.anyio
|
||||||
async def test_readiness_endpoint_times_out_and_cancels_stalled_gitea_check(monkeypatch):
|
async def test_readiness_endpoint_times_out_and_cancels_stalled_gitea_check(monkeypatch):
|
||||||
cancelled = asyncio.Event()
|
cancelled = asyncio.Event()
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user