From 9e9ba158139694f5d328d185902aaf931b7d8e57 Mon Sep 17 00:00:00 2001 From: moson Date: Mon, 11 Sep 2023 19:12:10 +0200 Subject: [PATCH] housekeep: TU rename - Misc Fix some more test functions Signed-off-by: moson --- test/test_accounts_routes.py | 22 +++++++++++----------- test/test_adduser.py | 2 +- test/test_html.py | 2 +- test/test_notify.py | 8 ++++---- test/test_packages_routes.py | 4 ++-- test/test_pkgbase_routes.py | 2 +- test/test_user.py | 2 +- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/test/test_accounts_routes.py b/test/test_accounts_routes.py index c8fdf25b..a9cb6f7d 100644 --- a/test/test_accounts_routes.py +++ b/test/test_accounts_routes.py @@ -684,7 +684,7 @@ def test_get_account_edit_pm_as_pm(client: TestClient, pm_user: User): assert email.attrib["value"] == user2.Email -def test_get_account_edit_as_tu(client: TestClient, pm_user: User): +def test_get_account_edit_as_pm(client: TestClient, pm_user: User): """Test edit get route of another user as a PM.""" with db.begin(): user2 = create_user("test2") @@ -723,9 +723,9 @@ def test_get_account_edit_type(client: TestClient, user: User): assert "id_type" not in response.text -def test_get_account_edit_type_as_tu(client: TestClient, pm_user: User): +def test_get_account_edit_type_as_pm(client: TestClient, pm_user: User): with db.begin(): - user2 = create_user("test_tu") + user2 = create_user("test_pm") cookies = {"AURSID": pm_user.login(Request(), "testPassword")} endpoint = f"/account/{user2.Username}/edit" @@ -795,9 +795,9 @@ def test_post_account_edit(client: TestClient, user: User): assert expected in response.content.decode() -def test_post_account_edit_type_as_tu(client: TestClient, pm_user: User): +def test_post_account_edit_type_as_pm(client: TestClient, pm_user: User): with db.begin(): - user2 = create_user("test_tu") + user2 = create_user("test_pm") cookies = {"AURSID": pm_user.login(Request(), "testPassword")} endpoint = f"/account/{user2.Username}/edit" @@ -833,9 +833,9 @@ def test_post_account_edit_type_as_dev(client: TestClient, pm_user: User): assert user2.AccountTypeID == at.DEVELOPER_ID -def test_post_account_edit_invalid_type_as_tu(client: TestClient, pm_user: User): +def test_post_account_edit_invalid_type_as_pm(client: TestClient, pm_user: User): with db.begin(): - user2 = create_user("test_tu") + user2 = create_user("test_pm") pm_user.AccountTypeID = at.PACKAGE_MAINTAINER_ID cookies = {"AURSID": pm_user.login(Request(), "testPassword")} @@ -1250,7 +1250,7 @@ def test_post_account_edit_other_user_as_user(client: TestClient, user: User): assert resp.headers.get("location") == f"/account/{user2.Username}" -def test_post_account_edit_self_type_as_tu(client: TestClient, pm_user: User): +def test_post_account_edit_self_type_as_pm(client: TestClient, pm_user: User): cookies = {"AURSID": pm_user.login(Request(), "testPassword")} endpoint = f"/account/{pm_user.Username}/edit" @@ -1276,7 +1276,7 @@ def test_post_account_edit_self_type_as_tu(client: TestClient, pm_user: User): assert pm_user.AccountTypeID == USER_ID -def test_post_account_edit_other_user_type_as_tu( +def test_post_account_edit_other_user_type_as_pm( client: TestClient, pm_user: User, caplog: pytest.LogCaptureFixture ): caplog.set_level(DEBUG) @@ -1319,7 +1319,7 @@ def test_post_account_edit_other_user_type_as_tu( assert expected in caplog.text -def test_post_account_edit_other_user_suspend_as_tu(client: TestClient, pm_user: User): +def test_post_account_edit_other_user_suspend_as_pm(client: TestClient, pm_user: User): with db.begin(): user = create_user("test3") # Create a session for user @@ -2167,7 +2167,7 @@ def test_account_delete_self_with_ssh_public_key(client: TestClient, user: User) assert sshpubkey_record is None -def test_account_delete_as_tu(client: TestClient, pm_user: User): +def test_account_delete_as_pm(client: TestClient, pm_user: User): with db.begin(): user = create_user("user2") diff --git a/test/test_adduser.py b/test/test_adduser.py index 8a497f90..13648d5e 100644 --- a/test/test_adduser.py +++ b/test/test_adduser.py @@ -38,7 +38,7 @@ def test_adduser(): assert test.login(Request(), "abcd1234") -def test_adduser_tu(): +def test_adduser_pm(): run_main( [ "-u", diff --git a/test/test_html.py b/test/test_html.py index ceac9dc6..ad35154a 100644 --- a/test/test_html.py +++ b/test/test_html.py @@ -81,7 +81,7 @@ def test_archdev_navbar_authenticated(client: TestClient, user: User): assert item.text.strip() == expected[i] -def test_archdev_navbar_authenticated_tu(client: TestClient, package_maintainer: User): +def test_archdev_navbar_authenticated_pm(client: TestClient, package_maintainer: User): expected = [ "Dashboard", "Packages", diff --git a/test/test_notify.py b/test/test_notify.py index e955bfd9..3d773bc2 100644 --- a/test/test_notify.py +++ b/test/test_notify.py @@ -390,7 +390,7 @@ please go to [3] and click "Disable notifications". assert email.body == expected -def set_tu(users: list[User]) -> User: +def set_pm(users: list[User]) -> User: with db.begin(): for user in users: user.AccountTypeID = PACKAGE_MAINTAINER_ID @@ -399,7 +399,7 @@ def set_tu(users: list[User]) -> User: def test_open_close_request( user: User, user2: User, pkgreq: PackageRequest, pkgbases: list[PackageBase] ): - set_tu([user]) + set_pm([user]) pkgbase = pkgbases[0] # Send an open request notification. @@ -545,7 +545,7 @@ This is a test closure comment. def test_vote_reminders(user: User): - set_tu([user]) + set_pm([user]) vote_id = 1 notif = notify.VoteReminderNotification(vote_id) @@ -568,7 +568,7 @@ ends in less than 48 hours. def test_notify_main(user: User): """Test PM vote reminder through aurweb.notify.main().""" - set_tu([user]) + set_pm([user]) vote_id = 1 args = ["aurweb-notify", "vote-reminder", str(vote_id)] diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py index 9c038c14..e1c989da 100644 --- a/test/test_packages_routes.py +++ b/test/test_packages_routes.py @@ -121,7 +121,7 @@ def pm_user(): pm_user = db.create( User, Username="test_pm", - Email="test_tu@example.org", + Email="test_pm@example.org", RealName="Test PM", Passwd="testPassword", AccountType=pm_type, @@ -613,7 +613,7 @@ def test_package_authenticated_maintainer( assert unexpected_text not in resp.text -def test_package_authenticated_tu( +def test_package_authenticated_pm( client: TestClient, pm_user: User, package: Package, pkgreq: PackageRequest ): cookies = {"AURSID": pm_user.login(Request(), "testPassword")} diff --git a/test/test_pkgbase_routes.py b/test/test_pkgbase_routes.py index b3bf705c..a413fe8a 100644 --- a/test/test_pkgbase_routes.py +++ b/test/test_pkgbase_routes.py @@ -124,7 +124,7 @@ def pm_user(): pm_user = db.create( User, Username="test_pm", - Email="test_tu@example.org", + Email="test_pm@example.org", RealName="Test PM", Passwd="testPassword", AccountType=pm_type, diff --git a/test/test_user.py b/test/test_user.py index ac6be274..c4f9e667 100644 --- a/test/test_user.py +++ b/test/test_user.py @@ -53,7 +53,7 @@ def user() -> User: @pytest.fixture def pm_user() -> User: - user = create_user("test_tu", PACKAGE_MAINTAINER_ID) + user = create_user("test_pm", PACKAGE_MAINTAINER_ID) yield user