From bbb6dfda39cee271d912ff2c81abb16f45ac7d40 Mon Sep 17 00:00:00 2001
From: Mohammad Torkashvand <mohammad.torkashvand@geant.org>
Date: Sat, 19 Oct 2024 11:07:38 +0200
Subject: [PATCH] Add pytest-xdist for parallel test execution
---
requirements.txt | 1 +
test/conftest.py | 8 ++++++--
tox.ini | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/requirements.txt b/requirements.txt
index 621780cce..52ed7721d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -23,3 +23,4 @@ sphinx-rtd-theme==2.0.0
urllib3_mock==0.3.3
pytest-asyncio==0.23.6
pre-commit~=3.7.0
+pytest-xdist==3.6.1
\ No newline at end of file
diff --git a/test/conftest.py b/test/conftest.py
index 2eb7e6a28..70206f90f 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -142,7 +142,11 @@ def data_config_filename() -> str:
@pytest.fixture(scope="session")
def db_uri():
- """Provide the database uri configuration to run the migration on."""
+ """Provide a unique database URI for each pytest-xdist worker, or a default URI if running without xdist."""
+ worker_id = os.getenv("PYTEST_XDIST_WORKER")
+ if worker_id:
+ return os.environ.get(f"postgresql://nwa:nwa@localhost/gso-test-db_{worker_id}")
+
return os.environ.get("DATABASE_URI_TEST", "postgresql://nwa:nwa@localhost/gso-test-db")
@@ -281,7 +285,7 @@ def partner_factory():
return _create_partner
-@pytest.fixture(scope="session")
+@pytest.fixture()
def geant_partner(partner_factory):
return partner_factory(name="GEANT-TEST", email="goat-test@geant.org")
diff --git a/tox.ini b/tox.ini
index a8eab7b2f..cf178b176 100644
--- a/tox.ini
+++ b/tox.ini
@@ -21,7 +21,7 @@ commands =
ruff format --respect-gitignore --preview --check .
mypy .
coverage erase
- coverage run --source gso --omit="gso/migrations/*" -m pytest {posargs}
+ coverage run --source gso --omit="gso/migrations/*" -m pytest -n auto {posargs}
coverage xml
coverage html
sh -c "if [ $SKIP_ALL_TESTS -eq 1 ]; then echo 'Skipping coverage report'; else coverage report --fail-under 80; fi"
--
GitLab