external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(test): Remove file locking and semaphore

Browse source 
All tests within a file run in the same worker and out test DB names
are unique per file as well. We don't really need a locking
mechanism here.

Same is valid for the test-emails. The only potential issue is that it
might try to create the same directory multiple times and thus run
into an error. However, that can be covered by specifying
"exist_ok=True" with os.makedirs such that those errors are ignored.

Signed-off-by: moson <moson@archlinux.org>
This commit is contained in:
moson 2023-08-26 14:47:21 +02:00
parent 9eda6a42c6
commit 5699e9bb41
No known key found for this signature in database
GPG key ID: 4A4760AB4EE15296
1 changed files with 11 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
test/conftest.py
View file

@ -43,7 +43,6 @@ from multiprocessing import Lock
import py import py
import pytest import pytest
from posix_ipc import O_CREAT, Semaphore
from sqlalchemy import create_engine from sqlalchemy import create_engine
from sqlalchemy.engine import URL from sqlalchemy.engine import URL
from sqlalchemy.engine.base import Engine from sqlalchemy.engine.base import Engine
@ -54,7 +53,6 @@ import aurweb.config
import aurweb.db import aurweb.db
from aurweb import aur_logging, initdb, testing from aurweb import aur_logging, initdb, testing
from aurweb.testing.email import Email from aurweb.testing.email import Email
from aurweb.testing.filelock import FileLock
from aurweb.testing.git import GitRepository from aurweb.testing.git import GitRepository
logger = aur_logging.get_logger(__name__) logger = aur_logging.get_logger(__name__)
@ -133,20 +131,16 @@ def _drop_database(engine: Engine, dbname: str) -> None:
def setup_email(): def setup_email():
# TODO: Fix this data race! This try/catch is ugly; why is it even if not os.path.exists(Email.TEST_DIR):
# racing here? Perhaps we need to multiproc + multithread lock # Create the directory.
# inside of setup_database to block the check? os.makedirs(Email.TEST_DIR, exist_ok=True)
with Semaphore("/test-emails", flags=O_CREAT, initial_value=1):
if not os.path.exists(Email.TEST_DIR):
# Create the directory.
os.makedirs(Email.TEST_DIR)
# Cleanup all email files for this test suite. # Cleanup all email files for this test suite.
prefix = Email.email_prefix(suite=True) prefix = Email.email_prefix(suite=True)
files = os.listdir(Email.TEST_DIR) files = os.listdir(Email.TEST_DIR)
for file in files: for file in files:
if file.startswith(prefix): if file.startswith(prefix):
os.remove(os.path.join(Email.TEST_DIR, file)) os.remove(os.path.join(Email.TEST_DIR, file))
@pytest.fixture(scope="module") @pytest.fixture(scope="module")
@ -155,20 +149,8 @@ def setup_database(tmp_path_factory: pathlib.Path, worker_id: str) -> None:
engine = test_engine() engine = test_engine()
dbname = aurweb.db.name() dbname = aurweb.db.name()
if worker_id == "master": # pragma: no cover setup_email()
# If we're not running tests through multiproc pytest-xdist. _create_database(engine, dbname)
setup_email()
yield _create_database(engine, dbname)
_drop_database(engine, dbname)
return
def setup(path):
setup_email()
_create_database(engine, dbname)
tmpdir = tmp_path_factory.getbasetemp().parent
file_lock = FileLock(tmpdir, dbname)
file_lock.lock(on_create=setup)
yield # Run the test function depending on this fixture. yield # Run the test function depending on this fixture.
_drop_database(engine, dbname) # Cleanup the database. _drop_database(engine, dbname) # Cleanup the database.