CI: Try to run with 4 threads

* GH Actions: Fix PostgreSQL issues

* Map PostgreSQL port

.github/workflows/strings.yml

@@ -35,7 +35,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pip-
       - name: Install system packages
-        run: sudo apt update && sudo apt install -y gettext
+        run: sudo apt update && sudo apt -y install gettext
       - name: Install Dependencies
         run: pip3 install uv && uv pip install --system -e ".[dev]"
       - name: Compile messages
@@ -60,7 +60,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pip-
       - name: Install system packages
-        run: sudo apt update && sudo apt install -y enchant-2 hunspell hunspell-de-de aspell-en aspell-de
+        run: sudo apt update && sudo apt install enchant-2 hunspell hunspell-de-de aspell-en aspell-de
       - name: Install Dependencies
         run: pip3 install uv && uv pip install --system -e ".[dev]"
       - name: Spellcheck translations

.github/workflows/tests.yml

@@ -22,7 +22,6 @@ jobs:
     runs-on: ubuntu-22.04
     name: Tests
     strategy:
-      fail-fast: false
       matrix:
         python-version: ["3.9", "3.10", "3.11"]
         database: [sqlite, postgres]
@@ -71,10 +70,10 @@ jobs:
         run: make all compress
       - name: Run tests
         working-directory: ./src
-        run: PRETIX_CONFIG_FILE=tests/ci_${{ matrix.database }}.cfg py.test -n 3 --stepwise -vv -p no:sugar --cov=./ --cov-report=xml --reruns 0 tests
+        run: PRETIX_CONFIG_FILE=tests/travis_${{ matrix.database }}.cfg py.test -n 4 -p no:sugar --cov=./ --cov-report=xml --reruns 3 tests --maxfail=100
       - name: Run concurrency tests
         working-directory: ./src
-        run: PRETIX_CONFIG_FILE=tests/ci_${{ matrix.database }}.cfg py.test tests/concurrency_tests/ --reruns 0 --reuse-db
+        run: PRETIX_CONFIG_FILE=tests/travis_${{ matrix.database }}.cfg py.test tests/concurrency_tests/ --reruns 0 --reuse-db
         if: matrix.database == 'postgres'
       - name: Upload coverage
         uses: codecov/codecov-action@v1

.gitlab-ci.yml

@@ -10,7 +10,7 @@ tests:
         - cd src
         - python manage.py check
         - make all compress
-        - PRETIX_CONFIG_FILE=tests/ci_sqlite.cfg py.test --reruns 3 -n 3 tests --maxfail=100
+        - PRETIX_CONFIG_FILE=tests/travis_sqlite.cfg py.test --reruns 3 -n 3 tests --maxfail=100
     except:
         - pypi
 pypi:

src/pretix/testutils/mock.py

@@ -19,6 +19,7 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
+import os
 from contextlib import contextmanager
 
 import fakeredis
@@ -38,4 +39,9 @@ def mocker_context():
 
 
 def get_redis_connection(alias="default", write=True):
-    return fakeredis.FakeStrictRedis(server=fakeredis.FakeServer.get_server("127.0.0.1:None:v(7, 0)", (7, 0), server_type="redis"))
+    worker_id = os.environ.get("PYTEST_XDIST_WORKER")
+    if worker_id.startswith("gw"):
+        redis_port = 1000 + int(worker_id.replace("gw", ""))
+    else:
+        redis_port = 1000
+    return fakeredis.FakeStrictRedis(server=fakeredis.FakeServer.get_server(f"127.0.0.1:{redis_port}:redis:v(7, 0)", (7, 0), server_type="redis"))

src/tests/conftest.py

@@ -23,7 +23,6 @@ import inspect
 import os
 
 import pytest
-from django.db import connection
 from django.test import override_settings
 from django.utils import translation
 from django_scopes import scopes_disabled
@@ -84,27 +83,32 @@ def reset_locale():
 
 @pytest.fixture
 def fakeredis_client(monkeypatch):
+    worker_id = os.environ.get("PYTEST_XDIST_WORKER")
+    if worker_id.startswith("gw"):
+        redis_port = 1000 + int(worker_id.replace("gw", ""))
+    else:
+        redis_port = 1000
     with override_settings(
         HAS_REDIS=True,
         REAL_CACHE_USED=True,
         CACHES={
             'redis': {
                 'BACKEND': 'django.core.cache.backends.redis.RedisCache',
-                'LOCATION': 'redis://127.0.0.1',
+                'LOCATION': f'redis://127.0.0.1:{redis_port}',
                 'OPTIONS': {
                     'connection_class': FakeConnection
                 }
             },
             'redis_session': {
                 'BACKEND': 'django.core.cache.backends.redis.RedisCache',
-                'LOCATION': 'redis://127.0.0.1',
+                'LOCATION': f'redis://127.0.0.1:{redis_port}',
                 'OPTIONS': {
                     'connection_class': FakeConnection
                 }
             },
             'default': {
                 'BACKEND': 'django.core.cache.backends.redis.RedisCache',
-                'LOCATION': 'redis://127.0.0.1',
+                'LOCATION': f'redis://127.0.0.1:{redis_port}',
                 'OPTIONS': {
                     'connection_class': FakeConnection
                 }
@@ -115,23 +119,3 @@ def fakeredis_client(monkeypatch):
         redis.flushall()
         monkeypatch.setattr('django_redis.get_redis_connection', get_redis_connection, raising=False)
         yield redis
-
-
-if os.environ.get("GITHUB_WORKFLOW", ""):
-    @pytest.fixture(autouse=True)
-    def ensure_healthy_connection(request):
-        # We have no idea why this is neccessary. It shouldn't be, and it costs some performance.
-        # However, in ~August 2024 our tests became really flake on GitHub Actions (failing more than 80% of the time)
-        # for no apparent reason with some error messages related to PostgreSQL connection issues. This appears to
-        # work around it...
-
-        # Check if the test even has DB access
-        marker = request.node.get_closest_marker("django_db")
-
-        # Run actual test
-        yield
-
-        # If yes, do a dummy query at the end of the test
-        if marker:
-            with connection.cursor() as cursor:
-                cursor.execute("SELECT 1")