mirror of
https://gitlab.archlinux.org/archlinux/aurweb.git
synced 2025-02-03 10:43:03 +01:00
fix(test): FastAPI 0.87.0 - warning fixes
FastAPI 0.87.0 switched to the httpx library for their TestClient * cookies need to be defined on the request instance instead of method calls Signed-off-by: moson-mo <mo-son@mailbox.org>
This commit is contained in:
moson-mo
parent
1216399d53
commit
a832b3cddb
10 changed files with 463 additions and 281 deletions
|
|
@ -254,7 +254,8 @@ def test_request(client: TestClient, auser: User, pkgbase: PackageBase):
|
|||
"""Test the standard pkgbase request route GET method."""
|
||||
endpoint = f"/pkgbase/{pkgbase.Name}/request"
|
||||
with client as request:
|
||||
resp = request.get(endpoint, cookies=auser.cookies)
|
||||
request.cookies = auser.cookies
|
||||
resp = request.get(endpoint)
|
||||
assert resp.status_code == int(HTTPStatus.OK)
|
||||
|
||||
|
||||
|
|
@ -263,7 +264,8 @@ def test_request_post_deletion(client: TestClient, auser2: User, pkgbase: Packag
|
|||
endpoint = f"/pkgbase/{pkgbase.Name}/request"
|
||||
data = {"comments": "Test request.", "type": "deletion"}
|
||||
with client as request:
|
||||
resp = request.post(endpoint, data=data, cookies=auser2.cookies)
|
||||
request.cookies = auser2.cookies
|
||||
resp = request.post(endpoint, data=data)
|
||||
assert resp.status_code == int(HTTPStatus.SEE_OTHER)
|
||||
|
||||
pkgreq = pkgbase.requests.first()
|
||||
|
|
@ -285,7 +287,8 @@ def test_request_post_deletion_as_maintainer(
|
|||
endpoint = f"/pkgbase/{pkgbase.Name}/request"
|
||||
data = {"comments": "Test request.", "type": "deletion"}
|
||||
with client as request:
|
||||
resp = request.post(endpoint, data=data, cookies=auser.cookies)
|
||||
request.cookies = auser.cookies
|
||||
resp = request.post(endpoint, data=data)
|
||||
assert resp.status_code == int(HTTPStatus.SEE_OTHER)
|
||||
|
||||
# Check the pkgreq record got created and accepted.
|
||||
|
|
@ -368,7 +371,8 @@ def test_request_post_merge(
|
|||
"comments": "Test request.",
|
||||
}
|
||||
with client as request:
|
||||
resp = request.post(endpoint, data=data, cookies=auser.cookies)
|
||||
request.cookies = auser.cookies
|
||||
resp = request.post(endpoint, data=data)
|
||||
assert resp.status_code == int(HTTPStatus.SEE_OTHER)
|
||||
|
||||
pkgreq = pkgbase.requests.first()
|
||||
|
|
@ -392,7 +396,8 @@ def test_request_post_orphan(client: TestClient, auser: User, pkgbase: PackageBa
|
|||
"comments": "Test request.",
|
||||
}
|
||||
with client as request:
|
||||
resp = request.post(endpoint, data=data, cookies=auser.cookies)
|
||||
request.cookies = auser.cookies
|
||||
resp = request.post(endpoint, data=data)
|
||||
assert resp.status_code == int(HTTPStatus.SEE_OTHER)
|
||||
|
||||
pkgreq = pkgbase.requests.first()
|
||||
|
|
@ -428,7 +433,8 @@ def test_deletion_request(
|
|||
comments = "Test closure."
|
||||
data = {"comments": comments, "confirm": True}
|
||||
with client as request:
|
||||
resp = request.post(endpoint, data=data, cookies=tu_user.cookies)
|
||||
request.cookies = tu_user.cookies
|
||||
resp = request.post(endpoint, data=data)
|
||||
assert resp.status_code == int(HTTPStatus.SEE_OTHER)
|
||||
assert resp.headers.get("location") == "/packages"
|
||||
|
||||
|
|
@ -460,7 +466,8 @@ def test_deletion_autorequest(client: TestClient, tu_user: User, pkgbase: Packag
|
|||
endpoint = f"/pkgbase/{pkgbase.Name}/delete"
|
||||
data = {"confirm": True}
|
||||
with client as request:
|
||||
resp = request.post(endpoint, data=data, cookies=tu_user.cookies)
|
||||
request.cookies = tu_user.cookies
|
||||
resp = request.post(endpoint, data=data)
|
||||
assert resp.status_code == int(HTTPStatus.SEE_OTHER)
|
||||
|
||||
assert resp.headers.get("location") == "/packages"
|
||||
|
|
@ -498,7 +505,8 @@ def test_merge_request(
|
|||
comments = "Test merge closure."
|
||||
data = {"into": target.Name, "comments": comments, "confirm": True}
|
||||
with client as request:
|
||||
resp = request.post(endpoint, data=data, cookies=tu_user.cookies)
|
||||
request.cookies = tu_user.cookies
|
||||
resp = request.post(endpoint, data=data)
|
||||
assert resp.status_code == int(HTTPStatus.SEE_OTHER)
|
||||
assert resp.headers.get("location") == f"/pkgbase/{target.Name}"
|
||||
|
||||
|
|
@ -545,7 +553,8 @@ def test_merge_autorequest(
|
|||
endpoint = f"/pkgbase/{pkgbase.Name}/merge"
|
||||
data = {"into": target.Name, "confirm": True}
|
||||
with client as request:
|
||||
resp = request.post(endpoint, data=data, cookies=tu_user.cookies)
|
||||
request.cookies = tu_user.cookies
|
||||
resp = request.post(endpoint, data=data)
|
||||
assert resp.status_code == int(HTTPStatus.SEE_OTHER)
|
||||
assert resp.headers.get("location") == f"/pkgbase/{target.Name}"
|
||||
|
||||
|
|
@ -582,7 +591,8 @@ def test_orphan_request(
|
|||
comments = "Test orphan closure."
|
||||
data = {"comments": comments, "confirm": True}
|
||||
with client as request:
|
||||
resp = request.post(endpoint, data=data, cookies=tu_user.cookies)
|
||||
request.cookies = tu_user.cookies
|
||||
resp = request.post(endpoint, data=data)
|
||||
assert resp.status_code == int(HTTPStatus.SEE_OTHER)
|
||||
assert resp.headers.get("location") == f"/pkgbase/{pkgbase.Name}"
|
||||
|
||||
|
|
@ -615,7 +625,8 @@ def test_request_post_orphan_autogenerated_closure(
|
|||
endpoint = f"/pkgbase/{pkgbase.Name}/disown"
|
||||
data = {"confirm": True}
|
||||
with client as request:
|
||||
resp = request.post(endpoint, data=data, cookies=tu_user.cookies)
|
||||
request.cookies = tu_user.cookies
|
||||
resp = request.post(endpoint, data=data)
|
||||
assert resp.status_code == int(HTTPStatus.SEE_OTHER)
|
||||
assert resp.headers.get("location") == f"/pkgbase/{pkgbase.Name}"
|
||||
|
||||
|
|
@ -677,7 +688,8 @@ def test_orphan_as_maintainer(client: TestClient, auser: User, pkgbase: PackageB
|
|||
endpoint = f"/pkgbase/{pkgbase.Name}/disown"
|
||||
data = {"confirm": True}
|
||||
with client as request:
|
||||
resp = request.post(endpoint, data=data, cookies=auser.cookies)
|
||||
request.cookies = auser.cookies
|
||||
resp = request.post(endpoint, data=data)
|
||||
assert resp.status_code == int(HTTPStatus.SEE_OTHER)
|
||||
assert resp.headers.get("location") == f"/pkgbase/{pkgbase.Name}"
|
||||
|
||||
|
|
@ -694,7 +706,8 @@ def test_orphan_without_requests(
|
|||
endpoint = f"/pkgbase/{pkgbase.Name}/disown"
|
||||
data = {"confirm": True}
|
||||
with client as request:
|
||||
resp = request.post(endpoint, data=data, cookies=tu_user.cookies)
|
||||
request.cookies = tu_user.cookies
|
||||
resp = request.post(endpoint, data=data)
|
||||
assert resp.status_code == int(HTTPStatus.BAD_REQUEST)
|
||||
|
||||
errors = get_errors(resp.text)
|
||||
|
|
@ -733,6 +746,7 @@ def test_requests(
|
|||
):
|
||||
cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
|
||||
with client as request:
|
||||
request.cookies = cookies
|
||||
resp = request.get(
|
||||
"/requests",
|
||||
params={
|
||||
|
|
@ -742,7 +756,6 @@ def test_requests(
|
|||
"SeB": "nd",
|
||||
"SB": "n",
|
||||
},
|
||||
cookies=cookies,
|
||||
)
|
||||
assert resp.status_code == int(HTTPStatus.OK)
|
||||
|
||||
|
|
@ -756,7 +769,8 @@ def test_requests(
|
|||
|
||||
# Request page 2 of the requests page.
|
||||
with client as request:
|
||||
resp = request.get("/requests", params={"O": 50}, cookies=cookies) # Page 2
|
||||
request.cookies = cookies
|
||||
resp = request.get("/requests", params={"O": 50}) # Page 2
|
||||
assert resp.status_code == int(HTTPStatus.OK)
|
||||
|
||||
assert "‹ Previous" in resp.text
|
||||
|
|
@ -775,6 +789,7 @@ def test_requests_with_filters(
|
|||
):
|
||||
cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
|
||||
with client as request:
|
||||
request.cookies = cookies
|
||||
resp = request.get(
|
||||
"/requests",
|
||||
params={
|
||||
|
|
@ -789,7 +804,6 @@ def test_requests_with_filters(
|
|||
"filter_rejected": True,
|
||||
"filter_maintainer_requests": False,
|
||||
},
|
||||
cookies=cookies,
|
||||
)
|
||||
assert resp.status_code == int(HTTPStatus.OK)
|
||||
|
||||
|
|
@ -803,6 +817,7 @@ def test_requests_with_filters(
|
|||
|
||||
# Request page 2 of the requests page.
|
||||
with client as request:
|
||||
request.cookies = cookies
|
||||
resp = request.get(
|
||||
"/requests",
|
||||
params={
|
||||
|
|
@ -813,7 +828,6 @@ def test_requests_with_filters(
|
|||
"filter_rejected": True,
|
||||
"filter_maintainer_requests": False,
|
||||
},
|
||||
cookies=cookies,
|
||||
) # Page 2
|
||||
assert resp.status_code == int(HTTPStatus.OK)
|
||||
|
||||
|
|
@ -833,10 +847,10 @@ def test_requests_for_maintainer_requests(
|
|||
):
|
||||
cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
|
||||
with client as request:
|
||||
request.cookies = cookies
|
||||
resp = request.get(
|
||||
"/requests",
|
||||
params={"filter_maintainer_requests": True},
|
||||
cookies=cookies,
|
||||
)
|
||||
assert resp.status_code == int(HTTPStatus.OK)
|
||||
|
||||
|
|
@ -854,7 +868,8 @@ def test_requests_by_deleted_users(
|
|||
|
||||
cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
|
||||
with client as request:
|
||||
resp = request.get("/requests", cookies=cookies)
|
||||
request.cookies = cookies
|
||||
resp = request.get("/requests")
|
||||
assert resp.status_code == HTTPStatus.OK
|
||||
|
||||
root = parse_root(resp.text)
|
||||
|
|
@ -867,7 +882,8 @@ def test_requests_selfmade(
|
|||
):
|
||||
cookies = {"AURSID": user.login(Request(), "testPassword")}
|
||||
with client as request:
|
||||
resp = request.get("/requests", cookies=cookies)
|
||||
request.cookies = cookies
|
||||
resp = request.get("/requests")
|
||||
assert resp.status_code == int(HTTPStatus.OK)
|
||||
|
||||
# As the user who creates all of the requests, we should see all of them.
|
||||
|
|
@ -885,7 +901,8 @@ def test_requests_selfmade(
|
|||
def test_requests_close(client: TestClient, user: User, pkgreq: PackageRequest):
|
||||
cookies = {"AURSID": user.login(Request(), "testPassword")}
|
||||
with client as request:
|
||||
resp = request.get(f"/requests/{pkgreq.ID}/close", cookies=cookies)
|
||||
request.cookies = cookies
|
||||
resp = request.get(f"/requests/{pkgreq.ID}/close")
|
||||
assert resp.status_code == int(HTTPStatus.OK)
|
||||
|
||||
|
||||
|
|
@ -894,7 +911,10 @@ def test_requests_close_unauthorized(
|
|||
):
|
||||
cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
|
||||
with client as request:
|
||||
resp = request.get(f"/requests/{pkgreq.ID}/close", cookies=cookies)
|
||||
request.cookies = cookies
|
||||
resp = request.get(
|
||||
f"/requests/{pkgreq.ID}/close",
|
||||
)
|
||||
assert resp.status_code == int(HTTPStatus.SEE_OTHER)
|
||||
assert resp.headers.get("location") == "/"
|
||||
|
||||
|
|
@ -904,10 +924,10 @@ def test_requests_close_post_unauthorized(
|
|||
):
|
||||
cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
|
||||
with client as request:
|
||||
request.cookies = cookies
|
||||
resp = request.post(
|
||||
f"/requests/{pkgreq.ID}/close",
|
||||
data={"reason": ACCEPTED_ID},
|
||||
cookies=cookies,
|
||||
)
|
||||
assert resp.status_code == int(HTTPStatus.SEE_OTHER)
|
||||
assert resp.headers.get("location") == "/"
|
||||
|
|
@ -916,7 +936,8 @@ def test_requests_close_post_unauthorized(
|
|||
def test_requests_close_post(client: TestClient, user: User, pkgreq: PackageRequest):
|
||||
cookies = {"AURSID": user.login(Request(), "testPassword")}
|
||||
with client as request:
|
||||
resp = request.post(f"/requests/{pkgreq.ID}/close", cookies=cookies)
|
||||
request.cookies = cookies
|
||||
resp = request.post(f"/requests/{pkgreq.ID}/close")
|
||||
assert resp.status_code == int(HTTPStatus.SEE_OTHER)
|
||||
|
||||
assert pkgreq.Status == REJECTED_ID
|
||||
|
|
@ -929,7 +950,10 @@ def test_requests_close_post_rejected(
|
|||
):
|
||||
cookies = {"AURSID": user.login(Request(), "testPassword")}
|
||||
with client as request:
|
||||
resp = request.post(f"/requests/{pkgreq.ID}/close", cookies=cookies)
|
||||
request.cookies = cookies
|
||||
resp = request.post(
|
||||
f"/requests/{pkgreq.ID}/close",
|
||||
)
|
||||
assert resp.status_code == int(HTTPStatus.SEE_OTHER)
|
||||
|
||||
assert pkgreq.Status == REJECTED_ID
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue