Skip to content

APM-1710 Use allow_retries functionality on smoketests #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
acarriedev merged 2 commits into from
Jan 15, 2021
Merged

APM-1710 Use allow_retries functionality on smoketests #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84109ee
APM-1710 Use allow_retries functionality on smoketests
acarriedev Jan 15, 2021
c452b7d
APM-1710 Change test type back to e2e
acarriedev Jan 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion e2e/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ pytest-asyncio = "^0.14.0"
coverage = "^5.3"

[tool.poetry.dev-dependencies]
api-test-utils = {url = "https://github.com/NHSDigital/apim-test-utils/releases/download/v1.0.14-alpha/api_test_utils-1.0.14a0-py3-none-any.whl"}
api-test-utils = {url = "https://github.com/NHSDigital/apim-test-utils/releases/download/v1.0.41-alpha/api_test_utils-1.0.41a0-py3-none-any.whl"}

[build-system]
requires = ["poetry>=0.12"]
Expand Down
16 changes: 8 additions & 8 deletions e2e/tests/api_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,22 +49,22 @@ async def _is_complete(resp: ClientResponse):
@pytest.mark.asyncio
async def test_api_status_with_service_header_another_service(api_client: APISessionClient):

async with api_client.get("_status", headers={'x-apim-service': 'async-slowapp'}) as r:
assert r.status == 200, (r.status, r.reason, (await r.text())[:2000])
body = await r.json()
r = await api_client.get("_status", allow_retries=True, max_retries=5, headers={'x-apim-service': 'async-slowapp'})
assert r.status == 200, (r.status, r.reason, (await r.text())[:2000])
body = await r.json()

assert body.get('service') == 'sync-wrap'
assert body.get('service') == 'sync-wrap'


@pytest.mark.smoketest
@pytest.mark.asyncio
async def test_api_status_with_service_header(api_client: APISessionClient):

async with api_client.get("_status", headers={'x-apim-service': 'sync-wrap'}) as r:
assert r.status == 200, (r.status, r.reason, (await r.text())[:2000])
body = await r.json()
r = await api_client.get("_status", allow_retries=True, max_retries=5, headers={'x-apim-service': 'sync-wrap'})
assert r.status == 200, (r.status, r.reason, (await r.text())[:2000])
body = await r.json()

assert body.get('service') == 'sync-wrap'
assert body.get('service') == 'sync-wrap'


@pytest.mark.asyncio
Expand Down