mirror of
https://gitlab.archlinux.org/archlinux/aurweb.git
synced 2025-02-03 10:43:03 +01:00
Sanitize and modernize pytests
Some of these tests were written before some of our convenient tooling existed. Additionally, some of the tests were not cooperating with PEP-8 guidelines or isorted. This commit does the following: - Replaces all calls to make_(user|session) with aurweb.db.create(Model, ...). - Replace calls to session.add(...) + session.commit() with aurweb.db.create. - Removes the majority of calls to (session|aurweb.db).delete(...). - Replaces session.query calls with aurweb.db.query. - Initializes all mutable globals in pytest fixture setup(). - Makes mutable global declarations more concise: `var1, var2 = None, None` -> `var1 = var2 = None` - Defines a warning exclusion for test/test_ssh_pub_key.py. - Removes the aurweb.testing.models module. - Removes some useless pytest.fixture yielding. As of this commit, developers should use the following guidelines when writing tests: - Always use aurweb.db.(create|delete|query) for database operations, where possible. - Always define mutable globals in the style: `var1 = var2 = None`. - `yield` the most dependent model in pytest setup fixture **iff** you must delete records after test runs to maintain database integrity. Example: test/test_account_type.py. This all makes the test code look and behave much cleaner. Previously, aurweb.testing.setup_test_db was buggy and leaving objects around in SQLAlchemy's IdentityMap. Signed-off-by: Kevin Morris <kevr@0cost.org>
This commit is contained in:
parent
f2121fb833
commit
38dc2bb99d
19 changed files with 160 additions and 239 deletions
|
@ -6,27 +6,23 @@ import pytest
|
|||
|
||||
from sqlalchemy import exc as sa_exc
|
||||
|
||||
from aurweb.db import create
|
||||
from aurweb.models.ban import Ban, is_banned
|
||||
from aurweb.testing import setup_test_db
|
||||
from aurweb.testing.requests import Request
|
||||
|
||||
ban = None
|
||||
|
||||
request = Request()
|
||||
ban = request = None
|
||||
|
||||
|
||||
@pytest.fixture(autouse=True)
|
||||
def setup():
|
||||
from aurweb.db import session
|
||||
|
||||
global ban
|
||||
global ban, request
|
||||
|
||||
setup_test_db("Bans")
|
||||
|
||||
ban = Ban(IPAddress="127.0.0.1",
|
||||
BanTS=datetime.utcnow() + timedelta(seconds=30))
|
||||
session.add(ban)
|
||||
session.commit()
|
||||
ts = datetime.utcnow() + timedelta(seconds=30)
|
||||
ban = create(Ban, IPAddress="127.0.0.1", BanTS=ts)
|
||||
request = Request()
|
||||
|
||||
|
||||
def test_ban():
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue