Merge pull request #46 from NHSDigital/apm-1710-update-tests-to-allow-retries

APM-1710 Use allow_retries functionality on smoketests

Author: acarriedev

e2e/pyproject.toml

@@ -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"]

e2e/tests/api_tests.py

@@ -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