test: fix flaky tests caused by multithreaded tests

.github/workflows/ci.yaml

@@ -98,11 +98,27 @@ jobs:
       - name: Check migrations are up to date
         run: poetry run /usr/bin/env aap-eda-manage makemigrations --dry-run --check
 
-      - name: Run tests
+      - name: Run default tests
         run: |
-          poetry run python -m pytest -vv --cov=./ --cov-report=xml --junit-xml=eda-server-test-results.xml
+          poetry run python -m pytest -vv \
+            --cov=./ \
+            --cov-report=xml \
+            --junit-xml=eda-server-default.xml
           echo "GIT_SHA=$(git rev-parse "$GITHUB_SHA")" >> "$GITHUB_ENV"
 
+      - name: Run multithreaded tests
+        run: |
+          poetry run python -m pytest -vv \
+            --cov=./ \
+            --cov-append \
+            --junit-xml=eda-server-multithreaded.xml \
+            -m "multithreaded"
+
+      - name: Merge test results
+        run: |
+          pip install junitparser
+          junitparser merge eda-server-default.xml eda-server-multithreaded.xml eda-server-test-results.xml
+
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v5
         with:

Taskfile.dist.yaml

@@ -79,6 +79,7 @@ tasks:
           $ task test -- tests/integration/api/test_activation.py::test_retrieve_activation
     cmds:
       - "{{.PYTEST_CMD}} {{.CLI_ARGS}}"
+      - "{{.PYTEST_CMD}} -m multithreaded {{.CLI_ARGS}}"
 
   lint:
     desc: "Run all linters."

pytest.ini

@@ -5,3 +5,6 @@ env =
     EDA_MODE=development
 DJANGO_SETTINGS_MODULE = aap_eda.settings.default
 log_file_level = INFO
+markers =
+    multithreaded # mark multithreaded tests, these tests must be run in a separate process
+

tests/conftest.py

@@ -25,6 +25,21 @@
 from aap_eda.settings import redis as redis_settings
 
 
+#################################################################
+# run tests setup
+#################################################################
+def pytest_runtest_setup(item):
+    marker_expr = item.config.getoption("-m")
+
+    if "multithreaded" in item.keywords and (
+        not marker_expr or "multithreaded" not in marker_expr
+    ):
+        pytest.skip(
+            "Skipped multithreaded test "
+            "(not explicitly selected via `-m multithreaded`)"
+        )
+
+
 #################################################################
 # Log capture factory
 #################################################################

tests/integration/test_advisory_lock.py

@@ -51,6 +51,7 @@
     ],
 )
 @pytest.mark.django_db
+@pytest.mark.multithreaded
 def test_job_uniqueness(module_data):
     call_log = []
     lock = Lock()