From de0f9190778b160fcb05cf4a6945eb4dd56b1aa1 Mon Sep 17 00:00:00 2001 From: Kevin Morris Date: Tue, 30 Nov 2021 22:06:32 -0800 Subject: [PATCH] housekeep(fastapi): rewrite test_ban with fixtures Signed-off-by: Kevin Morris --- test/test_ban.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/test/test_ban.py b/test/test_ban.py index 2c705410..ff49f7e2 100644 --- a/test/test_ban.py +++ b/test/test_ban.py @@ -11,20 +11,21 @@ from aurweb.db import create from aurweb.models.ban import Ban, is_banned from aurweb.testing.requests import Request -ban = request = None - @pytest.fixture(autouse=True) def setup(db_test): - global ban, request + return + +@pytest.fixture +def ban() -> Ban: ts = datetime.utcnow() + timedelta(seconds=30) with db.begin(): ban = create(Ban, IPAddress="127.0.0.1", BanTS=ts) - request = Request() + yield ban -def test_ban(): +def test_ban(ban: Ban): assert ban.IPAddress == "127.0.0.1" assert bool(ban.BanTS) @@ -45,11 +46,13 @@ def test_invalid_ban(): db.rollback() -def test_banned(): +def test_banned(ban: Ban): + request = Request() request.client.host = "127.0.0.1" assert is_banned(request) -def test_not_banned(): +def test_not_banned(ban: Ban): + request = Request() request.client.host = "192.168.0.1" assert not is_banned(request)