From c0849c9d9cddcbcd234c4e1012376ccedb342c2c Mon Sep 17 00:00:00 2001 From: Mira Weller Date: Fri, 25 Oct 2024 17:33:36 +0200 Subject: [PATCH] disable reruns --- .github/workflows/tests.yml | 2 +- src/tests/conftest.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 04aace5c29..2967752d92 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -65,7 +65,7 @@ jobs: run: make all compress - name: Run tests working-directory: ./src - run: PRETIX_CONFIG_FILE=tests/travis_${{ matrix.database }}.cfg py.test -n 3 -p no:sugar --cov=./ --cov-report=xml --reruns 3 tests --maxfail=100 || true + run: PRETIX_CONFIG_FILE=tests/travis_${{ matrix.database }}.cfg py.test -n 3 -p no:sugar --cov=./ --cov-report=xml --reruns 0 tests --maxfail=100 || true # XXXXXXXXXXXXXX for test only - name: print debug output diff --git a/src/tests/conftest.py b/src/tests/conftest.py index fb065ef69a..051bf0ad5f 100644 --- a/src/tests/conftest.py +++ b/src/tests/conftest.py @@ -139,11 +139,11 @@ if os.environ.get("GITHUB_WORKFLOW", ""): # Check if the test even has DB access marker = request.node.get_closest_marker("django_db") - f.write(str(time.time())+"\t"+ str(worker_id)+"\t"+str(request.path)+"\t"+ str(request.module)+"\t"+ str(request.function)+"\tstart\n") + f.write(str(time.time())+"\t"+ str(worker_id)+"\t"+str(request.path)+"\t"+ str(request.module.__name__)+"\t"+ str(request.function.__name__)+"\tstart\n") f.flush() # Run actual test yield - f.write(str(time.time())+"\t"+ str(worker_id)+"\t"+str(request.path)+"\t"+ str(request.module)+"\t"+ str(request.function)+"\tend\n") + f.write(str(time.time())+"\t"+ str(worker_id)+"\t"+str(request.path)+"\t"+ str(request.module.__name__)+"\t"+ str(request.function.__name__)+"\tend\n") f.flush() # If yes, do a dummy query at the end of the test #if marker: