external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(test): Fix "TestClient"

Browse source 
TestClient changes were reverted with 0.37.2:

https://github.com/encode/starlette/pull/2525
https://github.com/encode/starlette/releases/tag/0.37.2
Signed-off-by: moson <moson@archlinux.org>
This commit is contained in:
moson 2024-04-07 08:58:19 +02:00
parent 6ba06801f7
commit 21e2ef5ecb
No known key found for this signature in database
GPG key ID: 4A4760AB4EE15296
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
aurweb/util.py
View file

@ -213,6 +213,6 @@ def hash_query(query: Query):
def get_client_ip(request: fastapi.Request) -> str: def get_client_ip(request: fastapi.Request) -> str:
""" """
Returns the client's IP address for a Request. Returns the client's IP address for a Request.
Falls back to 'no-client' is request.client is None Falls back to 'testclient' if request.client is None
""" """
return request.client.host if request.client else "no-client" return request.client.host if request.client else "testclient"

4
test/test_accounts_routes.py
View file

@ -391,10 +391,10 @@ def test_post_register_error_invalid_captcha(client: TestClient):
def test_post_register_error_ip_banned(client: TestClient): def test_post_register_error_ip_banned(client: TestClient):
# 'no-client' is our fallback value in case request.client is None # 'testclient' is our fallback value in case request.client is None
# which is the case for TestClient # which is the case for TestClient
with db.begin(): with db.begin():
create(Ban, IPAddress="no-client", BanTS=datetime.utcnow()) create(Ban, IPAddress="testclient", BanTS=datetime.utcnow())
with client as request: with client as request:
response = post_register(request) response = post_register(request)

10
test/test_rpc.py
View file

@ -310,10 +310,10 @@ def pipeline():
redis = redis_connection() redis = redis_connection()
pipeline = redis.pipeline() pipeline = redis.pipeline()
# 'no-client' is our fallback value in case request.client is None # 'testclient' is our fallback value in case request.client is None
# which is the case for TestClient # which is the case for TestClient
pipeline.delete("ratelimit-ws:no-client") pipeline.delete("ratelimit-ws:testclient")
pipeline.delete("ratelimit:no-client") pipeline.delete("ratelimit:testclient")
pipeline.execute() pipeline.execute()
yield pipeline yield pipeline
@ -760,8 +760,8 @@ def test_rpc_ratelimit(
assert response.status_code == int(HTTPStatus.TOO_MANY_REQUESTS) assert response.status_code == int(HTTPStatus.TOO_MANY_REQUESTS)
# Delete the cached records. # Delete the cached records.
pipeline.delete("ratelimit-ws:no-client") pipeline.delete("ratelimit-ws:testclient")
pipeline.delete("ratelimit:no-client") pipeline.delete("ratelimit:testclient")
one, two = pipeline.execute() one, two = pipeline.execute()
assert one and two assert one and two