From 2b720aa07f87eda689ce6b49041a0e60b4134ba2 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sun, 29 Mar 2026 19:37:48 +0200 Subject: [PATCH 1/2] test_create_read_special_symlink: remove test skip --- src/borg/testsuite/archiver/create_cmd_test.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/borg/testsuite/archiver/create_cmd_test.py b/src/borg/testsuite/archiver/create_cmd_test.py index 2562aa3779..498e02e890 100644 --- a/src/borg/testsuite/archiver/create_cmd_test.py +++ b/src/borg/testsuite/archiver/create_cmd_test.py @@ -13,7 +13,7 @@ from ...constants import * # NOQA from ...constants import zeros from ...manifest import Manifest -from ...platform import is_win32 +from ...platform import is_win32, is_cygwin from ...platformflags import is_msystem from ...repository import Repository from ...helpers import CommandError, BackupPermissionError @@ -923,8 +923,7 @@ def test_create_topical(archivers, request): assert "file1" in output -# @pytest.mark.skipif(not are_fifos_supported() or is_cygwin, reason="FIFOs not supported, hangs on cygwin") -@pytest.mark.skip(reason="This test is problematic and should be skipped") +@pytest.mark.skipif(not are_fifos_supported() or is_cygwin, reason="FIFOs not supported, hangs on cygwin") def test_create_read_special_symlink(archivers, request): archiver = request.getfixturevalue(archivers) from threading import Thread From a5001648c02a7674732b49a8d195ec3ad01c0453 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sun, 29 Mar 2026 19:42:44 +0200 Subject: [PATCH 2/2] temp: only run test_create_read_special --- .github/workflows/ci.yml | 4 ++-- pyproject.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2c0d33a244..8c56974792 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -577,7 +577,7 @@ jobs: pip install -e . # troubles with either tox or pytest xdist, so we run pytest manually: - pytest -v -n auto -rs --cov=borg --cov-config=pyproject.toml --cov-report=xml --junitxml=test-results.xml --benchmark-skip -k "not remote and not socket" + pytest -v -rs --cov=borg --cov-config=pyproject.toml --cov-report=xml --junitxml=test-results.xml --benchmark-skip -k "not remote and not socket and test_create_read_special" ;; esac @@ -676,7 +676,7 @@ jobs: export PATH="$GITHUB_WORKSPACE/dist/binary/borg-dir:$PATH" borg.exe -V . env/bin/activate - python -m pytest -n4 --benchmark-skip -vv -rs -k "not remote" --cov=borg --cov-config=pyproject.toml --cov-report=xml --junitxml=test-results.xml + python -m pytest --benchmark-skip -vv -rs -k "not remote and test_create_read_special" --cov=borg --cov-config=pyproject.toml --cov-report=xml --junitxml=test-results.xml - name: Upload test results to Codecov if: ${{ !cancelled() }} diff --git a/pyproject.toml b/pyproject.toml index de1f852d51..6c9d99d363 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -180,7 +180,7 @@ env_list = ["py{310,311,312,313,314}-{none,llfuse,pyfuse3,mfusepy}", "docs", "ru [tool.tox.env_run_base] package = "editable-legacy" # without this it does not find setup_docs when running under fakeroot deps = ["-rrequirements.d/development.lock.txt"] -commands = [["python", "-m", "pytest", "-v", "-n", "{env:XDISTN:auto}", "-rs", "--cov=borg", "--cov-config=pyproject.toml", "--cov-report=xml", "--junitxml=test-results.xml", "--benchmark-skip", "--pyargs", "{posargs:borg.testsuite}"]] +commands = [["python", "-m", "pytest", "-v", "-k", "test_create_read_special", "-rs", "--cov=borg", "--cov-config=pyproject.toml", "--cov-report=xml", "--junitxml=test-results.xml", "--benchmark-skip", "--pyargs", "{posargs:borg.testsuite}"]] pass_env = ["*"] # fakeroot -u needs some env vars [tool.tox.env_pkg_base]