From 93bc91cce252ab789493aa5d0bc0c796f5133ae2 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 30 Nov 2021 20:25:10 -0800
Subject: [PATCH] housekeep(fastapi): rewrite test_tu_voteinfo with fixtures

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 test/test_tu_voteinfo.py | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/test/test_tu_voteinfo.py b/test/test_tu_voteinfo.py
index 5926fbf9..26fa9522 100644
--- a/test/test_tu_voteinfo.py
+++ b/test/test_tu_voteinfo.py
@@ -5,27 +5,27 @@ import pytest
 from sqlalchemy.exc import IntegrityError
 
 from aurweb import db
-from aurweb.db import create, query, rollback
-from aurweb.models.account_type import AccountType
+from aurweb.db import create, rollback
+from aurweb.models.account_type import TRUSTED_USER_ID
 from aurweb.models.tu_voteinfo import TUVoteInfo
 from aurweb.models.user import User
 
-user = None
-
 
 @pytest.fixture(autouse=True)
 def setup(db_test):
-    global user
+    return
 
-    tu_type = query(AccountType,
-                    AccountType.AccountType == "Trusted User").first()
+
+@pytest.fixture
+def user() -> User:
     with db.begin():
         user = create(User, Username="test", Email="test@example.org",
                       RealName="Test User", Passwd="testPassword",
-                      AccountType=tu_type)
+                      AccountTypeID=TRUSTED_USER_ID)
+    yield user
 
 
-def test_tu_voteinfo_creation():
+def test_tu_voteinfo_creation(user: User):
     ts = int(datetime.utcnow().timestamp())
     with db.begin():
         tu_voteinfo = create(TUVoteInfo,
@@ -49,7 +49,7 @@ def test_tu_voteinfo_creation():
     assert tu_voteinfo in user.tu_voteinfo_set
 
 
-def test_tu_voteinfo_is_running():
+def test_tu_voteinfo_is_running(user: User):
     ts = int(datetime.utcnow().timestamp())
     with db.begin():
         tu_voteinfo = create(TUVoteInfo,
@@ -65,7 +65,7 @@ def test_tu_voteinfo_is_running():
     assert tu_voteinfo.is_running() is False
 
 
-def test_tu_voteinfo_total_votes():
+def test_tu_voteinfo_total_votes(user: User):
     ts = int(datetime.utcnow().timestamp())
     with db.begin():
         tu_voteinfo = create(TUVoteInfo,
@@ -83,7 +83,7 @@ def test_tu_voteinfo_total_votes():
     assert tu_voteinfo.total_votes() == 9
 
 
-def test_tu_voteinfo_null_submitter_raises_exception():
+def test_tu_voteinfo_null_submitter_raises(user: User):
     with pytest.raises(IntegrityError):
         with db.begin():
             create(TUVoteInfo,
@@ -94,7 +94,7 @@ def test_tu_voteinfo_null_submitter_raises_exception():
     rollback()
 
 
-def test_tu_voteinfo_null_agenda_raises_exception():
+def test_tu_voteinfo_null_agenda_raises(user: User):
     with pytest.raises(IntegrityError):
         with db.begin():
             create(TUVoteInfo,
@@ -105,7 +105,7 @@ def test_tu_voteinfo_null_agenda_raises_exception():
     rollback()
 
 
-def test_tu_voteinfo_null_user_raises_exception():
+def test_tu_voteinfo_null_user_raises(user: User):
     with pytest.raises(IntegrityError):
         with db.begin():
             create(TUVoteInfo,
@@ -116,7 +116,7 @@ def test_tu_voteinfo_null_user_raises_exception():
     rollback()
 
 
-def test_tu_voteinfo_null_submitted_raises_exception():
+def test_tu_voteinfo_null_submitted_raises(user: User):
     with pytest.raises(IntegrityError):
         with db.begin():
             create(TUVoteInfo,
@@ -128,7 +128,7 @@ def test_tu_voteinfo_null_submitted_raises_exception():
     rollback()
 
 
-def test_tu_voteinfo_null_end_raises_exception():
+def test_tu_voteinfo_null_end_raises(user: User):
     with pytest.raises(IntegrityError):
         with db.begin():
             create(TUVoteInfo,
@@ -140,7 +140,7 @@ def test_tu_voteinfo_null_end_raises_exception():
     rollback()
 
 
-def test_tu_voteinfo_null_quorum_raises_exception():
+def test_tu_voteinfo_null_quorum_raises(user: User):
     with pytest.raises(IntegrityError):
         with db.begin():
             create(TUVoteInfo,