mirror of
https://gitlab.archlinux.org/archlinux/aurweb.git
synced 2025-02-03 10:43:03 +01:00
change(aurweb): add parallel tests and improve aurweb.db
This change utilizes pytest-xdist to perform a multiproc test run and reworks aurweb.db's code. We no longer use a global engine, session or Session, but we now use a memo of engines and sessions as they are requested, based on the PYTEST_CURRENT_TEST environment variable, which is available during testing. Additionally, this change strips several SQLite components out of the Python code-base. SQLite is still compatible with PHP and sharness tests, but not with our FastAPI implementation. More changes: ------------ - Remove use of aurweb.db.session global in other code. - Use new aurweb.db.name() dynamic db name function in env.py. - Added 'addopts' to pytest.ini which utilizes multiprocessing. - Highly recommended to leave this be or modify `-n auto` to `-n {cpu_threads}` where cpu_threads is at least 2. Signed-off-by: Kevin Morris <kevr@0cost.org>
This commit is contained in:
parent
07aac768d6
commit
fa43f6bc3e
55 changed files with 781 additions and 884 deletions
|
@ -5,41 +5,35 @@ import pytest
|
|||
from sqlalchemy.exc import IntegrityError
|
||||
|
||||
from aurweb import db
|
||||
from aurweb.db import create, query, rollback
|
||||
from aurweb.models.account_type import USER_ID
|
||||
from aurweb.models.package_base import PackageBase
|
||||
from aurweb.models.package_request import (ACCEPTED, ACCEPTED_ID, CLOSED, CLOSED_ID, PENDING, PENDING_ID, REJECTED,
|
||||
REJECTED_ID, PackageRequest)
|
||||
from aurweb.models.request_type import RequestType
|
||||
from aurweb.models.request_type import MERGE_ID
|
||||
from aurweb.models.user import User
|
||||
from aurweb.testing import setup_test_db
|
||||
|
||||
user = pkgbase = None
|
||||
|
||||
|
||||
@pytest.fixture(autouse=True)
|
||||
def setup():
|
||||
def setup(db_test):
|
||||
global user, pkgbase
|
||||
|
||||
setup_test_db("PackageRequests", "PackageBases", "Users")
|
||||
|
||||
with db.begin():
|
||||
user = create(User, Username="test", Email="test@example.org",
|
||||
RealName="Test User", Passwd="testPassword")
|
||||
pkgbase = create(PackageBase, Name="test-package", Maintainer=user)
|
||||
user = db.create(User, Username="test", Email="test@example.org",
|
||||
RealName="Test User", Passwd="testPassword",
|
||||
AccountTypeID=USER_ID)
|
||||
pkgbase = db.create(PackageBase, Name="test-package", Maintainer=user)
|
||||
|
||||
|
||||
def test_package_request_creation():
|
||||
request_type = query(RequestType, RequestType.Name == "merge").first()
|
||||
assert request_type.Name == "merge"
|
||||
|
||||
with db.begin():
|
||||
package_request = create(PackageRequest, RequestType=request_type,
|
||||
User=user, PackageBase=pkgbase,
|
||||
PackageBaseName=pkgbase.Name,
|
||||
Comments=str(), ClosureComment=str())
|
||||
package_request = db.create(PackageRequest, ReqTypeID=MERGE_ID,
|
||||
User=user, PackageBase=pkgbase,
|
||||
PackageBaseName=pkgbase.Name,
|
||||
Comments=str(), ClosureComment=str())
|
||||
|
||||
assert bool(package_request.ID)
|
||||
assert package_request.RequestType == request_type
|
||||
assert package_request.User == user
|
||||
assert package_request.PackageBase == pkgbase
|
||||
assert package_request.PackageBaseName == pkgbase.Name
|
||||
|
@ -47,22 +41,18 @@ def test_package_request_creation():
|
|||
assert package_request.ClosureComment == str()
|
||||
|
||||
# Make sure that everything is cross-referenced with relationships.
|
||||
assert package_request in request_type.package_requests
|
||||
assert package_request in user.package_requests
|
||||
assert package_request in pkgbase.requests
|
||||
|
||||
|
||||
def test_package_request_closed():
|
||||
request_type = query(RequestType, RequestType.Name == "merge").first()
|
||||
assert request_type.Name == "merge"
|
||||
|
||||
ts = int(datetime.utcnow().timestamp())
|
||||
with db.begin():
|
||||
package_request = create(PackageRequest, RequestType=request_type,
|
||||
User=user, PackageBase=pkgbase,
|
||||
PackageBaseName=pkgbase.Name,
|
||||
Closer=user, ClosedTS=ts,
|
||||
Comments=str(), ClosureComment=str())
|
||||
package_request = db.create(PackageRequest, ReqTypeID=MERGE_ID,
|
||||
User=user, PackageBase=pkgbase,
|
||||
PackageBaseName=pkgbase.Name,
|
||||
Closer=user, ClosedTS=ts,
|
||||
Comments=str(), ClosureComment=str())
|
||||
|
||||
assert package_request.Closer == user
|
||||
assert package_request.ClosedTS == ts
|
||||
|
@ -73,73 +63,54 @@ def test_package_request_closed():
|
|||
|
||||
def test_package_request_null_request_type_raises_exception():
|
||||
with pytest.raises(IntegrityError):
|
||||
with db.begin():
|
||||
create(PackageRequest, User=user, PackageBase=pkgbase,
|
||||
PackageBaseName=pkgbase.Name,
|
||||
Comments=str(), ClosureComment=str())
|
||||
rollback()
|
||||
PackageRequest(User=user, PackageBase=pkgbase,
|
||||
PackageBaseName=pkgbase.Name,
|
||||
Comments=str(), ClosureComment=str())
|
||||
|
||||
|
||||
def test_package_request_null_user_raises_exception():
|
||||
request_type = query(RequestType, RequestType.Name == "merge").first()
|
||||
with pytest.raises(IntegrityError):
|
||||
with db.begin():
|
||||
create(PackageRequest, RequestType=request_type,
|
||||
PackageBase=pkgbase, PackageBaseName=pkgbase.Name,
|
||||
Comments=str(), ClosureComment=str())
|
||||
rollback()
|
||||
PackageRequest(ReqTypeID=MERGE_ID,
|
||||
PackageBase=pkgbase, PackageBaseName=pkgbase.Name,
|
||||
Comments=str(), ClosureComment=str())
|
||||
|
||||
|
||||
def test_package_request_null_package_base_raises_exception():
|
||||
request_type = query(RequestType, RequestType.Name == "merge").first()
|
||||
with pytest.raises(IntegrityError):
|
||||
with db.begin():
|
||||
create(PackageRequest, RequestType=request_type,
|
||||
User=user, PackageBaseName=pkgbase.Name,
|
||||
Comments=str(), ClosureComment=str())
|
||||
rollback()
|
||||
PackageRequest(ReqTypeID=MERGE_ID,
|
||||
User=user, PackageBaseName=pkgbase.Name,
|
||||
Comments=str(), ClosureComment=str())
|
||||
|
||||
|
||||
def test_package_request_null_package_base_name_raises_exception():
|
||||
request_type = query(RequestType, RequestType.Name == "merge").first()
|
||||
with pytest.raises(IntegrityError):
|
||||
with db.begin():
|
||||
create(PackageRequest, RequestType=request_type,
|
||||
User=user, PackageBase=pkgbase,
|
||||
Comments=str(), ClosureComment=str())
|
||||
rollback()
|
||||
PackageRequest(ReqTypeID=MERGE_ID,
|
||||
User=user, PackageBase=pkgbase,
|
||||
Comments=str(), ClosureComment=str())
|
||||
|
||||
|
||||
def test_package_request_null_comments_raises_exception():
|
||||
request_type = query(RequestType, RequestType.Name == "merge").first()
|
||||
with pytest.raises(IntegrityError):
|
||||
with db.begin():
|
||||
create(PackageRequest, RequestType=request_type, User=user,
|
||||
PackageBase=pkgbase, PackageBaseName=pkgbase.Name,
|
||||
ClosureComment=str())
|
||||
rollback()
|
||||
PackageRequest(ReqTypeID=MERGE_ID, User=user,
|
||||
PackageBase=pkgbase, PackageBaseName=pkgbase.Name,
|
||||
ClosureComment=str())
|
||||
|
||||
|
||||
def test_package_request_null_closure_comment_raises_exception():
|
||||
request_type = query(RequestType, RequestType.Name == "merge").first()
|
||||
with pytest.raises(IntegrityError):
|
||||
with db.begin():
|
||||
create(PackageRequest, RequestType=request_type, User=user,
|
||||
PackageBase=pkgbase, PackageBaseName=pkgbase.Name,
|
||||
Comments=str())
|
||||
rollback()
|
||||
PackageRequest(ReqTypeID=MERGE_ID, User=user,
|
||||
PackageBase=pkgbase, PackageBaseName=pkgbase.Name,
|
||||
Comments=str())
|
||||
|
||||
|
||||
def test_package_request_status_display():
|
||||
""" Test status_display() based on the Status column value. """
|
||||
request_type = query(RequestType, RequestType.Name == "merge").first()
|
||||
|
||||
with db.begin():
|
||||
pkgreq = create(PackageRequest, RequestType=request_type,
|
||||
User=user, PackageBase=pkgbase,
|
||||
PackageBaseName=pkgbase.Name,
|
||||
Comments=str(), ClosureComment=str(),
|
||||
Status=PENDING_ID)
|
||||
pkgreq = db.create(PackageRequest, ReqTypeID=MERGE_ID,
|
||||
User=user, PackageBase=pkgbase,
|
||||
PackageBaseName=pkgbase.Name,
|
||||
Comments=str(), ClosureComment=str(),
|
||||
Status=PENDING_ID)
|
||||
assert pkgreq.status_display() == PENDING
|
||||
|
||||
with db.begin():
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue