From 012dd24fd85d24369556d4a3eb7e0675fa0c5856 Mon Sep 17 00:00:00 2001 From: Kevin Morris Date: Tue, 30 Nov 2021 01:53:02 -0800 Subject: [PATCH] housekeep(fastapi): rewrite test_tu_vote with fixtures Signed-off-by: Kevin Morris --- test/test_tu_vote.py | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/test/test_tu_vote.py b/test/test_tu_vote.py index 1dd33387..9bb344b1 100644 --- a/test/test_tu_vote.py +++ b/test/test_tu_vote.py @@ -10,28 +10,33 @@ from aurweb.models.tu_vote import TUVote from aurweb.models.tu_voteinfo import TUVoteInfo from aurweb.models.user import User -user = tu_voteinfo = None - @pytest.fixture(autouse=True) def setup(db_test): - global user, tu_voteinfo + return - ts = int(datetime.utcnow().timestamp()) + +@pytest.fixture +def user() -> User: with db.begin(): user = db.create(User, Username="test", Email="test@example.org", RealName="Test User", Passwd="testPassword", AccountTypeID=TRUSTED_USER_ID) + yield user - tu_voteinfo = db.create(TUVoteInfo, - Agenda="Blah blah.", + +@pytest.fixture +def tu_voteinfo(user: User) -> TUVoteInfo: + ts = int(datetime.utcnow().timestamp()) + with db.begin(): + tu_voteinfo = db.create(TUVoteInfo, Agenda="Blah blah.", User=user.Username, Submitted=ts, End=ts + 5, - Quorum=0.5, - Submitter=user) + Quorum=0.5, Submitter=user) + yield tu_voteinfo -def test_tu_vote_creation(): +def test_tu_vote_creation(user: User, tu_voteinfo: TUVoteInfo): with db.begin(): tu_vote = db.create(TUVote, User=user, VoteInfo=tu_voteinfo) @@ -41,11 +46,11 @@ def test_tu_vote_creation(): assert tu_vote in tu_voteinfo.tu_votes -def test_tu_vote_null_user_raises_exception(): +def test_tu_vote_null_user_raises_exception(tu_voteinfo: TUVoteInfo): with pytest.raises(IntegrityError): TUVote(VoteInfo=tu_voteinfo) -def test_tu_vote_null_voteinfo_raises_exception(): +def test_tu_vote_null_voteinfo_raises_exception(user: User): with pytest.raises(IntegrityError): TUVote(User=user)