github/datasette
1
0
Fork 0
mirror of https://github.com/simonw/datasette.git synced 2025-12-10 16:51:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

TestClient obeys allow_redirects again, refs #272

Browse source
This commit is contained in:
Simon Willison 2019-06-23 07:10:42 -07:00
commit 2b5a644dd7
1 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

20
tests/fixtures.py
View file

@ -30,11 +30,16 @@ class TestResponse:
class TestClient: class TestClient:
max_redirects = 5
def __init__(self, asgi_app): def __init__(self, asgi_app):
self.asgi_app = asgi_app self.asgi_app = asgi_app
@async_to_sync @async_to_sync
async def get(self, path, allow_redirects=True): async def get(self, path, allow_redirects=True, redirect_count=0):
return await self._get(path, allow_redirects, redirect_count)
async def _get(self, path, allow_redirects=True, redirect_count=0):
query_string = b"" query_string = b""
if "?" in path: if "?" in path:
path, _, query_string = path.partition("?") path, _, query_string = path.partition("?")
@ -69,7 +74,18 @@ class TestClient:
body += message["body"] body += message["body"]
if not message.get("more_body"): if not message.get("more_body"):
break break
return TestResponse(status, headers, body) response = TestResponse(status, headers, body)
if allow_redirects and response.status in (301, 302):
assert (
redirect_count < self.max_redirects
), "Redirected {} times, max_redirects={}".format(
redirect_count, self.max_redirects
)
location = response.headers["Location"]
return await self._get(
location, allow_redirects=True, redirect_count=redirect_count + 1
)
return response
def make_app_client( def make_app_client(