Skip to content
Snippets Groups Projects
Commit 5ef7e076 authored by Mohammad Torkashvand's avatar Mohammad Torkashvand
Browse files

Add pytest-xdist for parallel test execution

parent b32b70b0
No related branches found
No related tags found
No related merge requests found
Pipeline #89771 canceled
This commit is part of merge request !292. Comments created here will be created in the context of that merge request.
...@@ -23,7 +23,7 @@ run-tox-pipeline: ...@@ -23,7 +23,7 @@ run-tox-pipeline:
POSTGRES_DB: gso-test-db POSTGRES_DB: gso-test-db
POSTGRES_USER: nwa POSTGRES_USER: nwa
POSTGRES_PASSWORD: nwa POSTGRES_PASSWORD: nwa
DATABASE_URI_TEST: 'postgresql://nwa:nwa@postgres:5432/gso-test-db' DATABASE_HOST: "postgres"
PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip" PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
cache: cache:
......
...@@ -23,3 +23,4 @@ sphinx-rtd-theme==2.0.0 ...@@ -23,3 +23,4 @@ sphinx-rtd-theme==2.0.0
urllib3_mock==0.3.3 urllib3_mock==0.3.3
pytest-asyncio==0.23.6 pytest-asyncio==0.23.6
pre-commit~=3.7.0 pre-commit~=3.7.0
pytest-xdist==3.6.1
\ No newline at end of file
...@@ -142,8 +142,14 @@ def data_config_filename() -> str: ...@@ -142,8 +142,14 @@ def data_config_filename() -> str:
@pytest.fixture(scope="session") @pytest.fixture(scope="session")
def db_uri(): 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."""
return os.environ.get("DATABASE_URI_TEST", "postgresql://nwa:nwa@localhost/gso-test-db") worker_id = os.getenv("PYTEST_XDIST_WORKER")
database_host = os.getenv("DATABASE_HOST", "localhost")
if worker_id:
return f"postgresql://nwa:nwa@{database_host}/gso-test-db_{worker_id}"
return os.environ.get("DATABASE_URI_TEST", f"postgresql://nwa:nwa@{database_host}/gso-test-db")
def run_migrations(db_uri: str) -> None: def run_migrations(db_uri: str) -> None:
...@@ -281,7 +287,7 @@ def partner_factory(): ...@@ -281,7 +287,7 @@ def partner_factory():
return _create_partner return _create_partner
@pytest.fixture(scope="session") @pytest.fixture()
def geant_partner(partner_factory): def geant_partner(partner_factory):
return partner_factory(name="GEANT-TEST", email="goat-test@geant.org") return partner_factory(name="GEANT-TEST", email="goat-test@geant.org")
......
...@@ -6,7 +6,7 @@ markers = "workflow,noautofixt" ...@@ -6,7 +6,7 @@ markers = "workflow,noautofixt"
filterwarnings = "ignore,default:::gso" filterwarnings = "ignore,default:::gso"
[testenv] [testenv]
passenv = DATABASE_URI_TEST,SKIP_ALL_TESTS,ENVIRONMENT_IGNORE_MUTATION_DISABLED passenv = DATABASE_URI_TEST,DATABASE_HOST,SKIP_ALL_TESTS,ENVIRONMENT_IGNORE_MUTATION_DISABLED
setenv = setenv =
OAUTH2_ACTIVE = False OAUTH2_ACTIVE = False
TRANSLATIONS_DIR = ./gso/translations TRANSLATIONS_DIR = ./gso/translations
...@@ -21,7 +21,8 @@ commands = ...@@ -21,7 +21,8 @@ commands =
ruff format --respect-gitignore --preview --check . ruff format --respect-gitignore --preview --check .
mypy . mypy .
coverage erase coverage erase
coverage run --source gso --omit="gso/migrations/*" -m pytest {posargs} coverage run -p --source=gso --omit="gso/migrations/*" -m pytest -n auto {posargs}
coverage combine
coverage xml coverage xml
coverage html coverage html
sh -c "if [ $SKIP_ALL_TESTS -eq 1 ]; then echo 'Skipping coverage report'; else coverage report --fail-under 80; fi" sh -c "if [ $SKIP_ALL_TESTS -eq 1 ]; then echo 'Skipping coverage report'; else coverage report --fail-under 80; fi"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment