upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-05-28 04:03:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #9161 from ThomasWaldmann/fix-freebsd-tests
Some checks failed
Lint / lint (push) Has been cancelled
Details
CI / lint (push) Has been cancelled
Details
CI / security (push) Has been cancelled
Details
CodeQL / Analyze (push) Has been cancelled
Details
CI / asan_ubsan (push) Has been cancelled
Details
CI / native_tests (push) Has been cancelled
Details
CI / vm_tests (Haiku, false, haiku, r1beta5) (push) Has been cancelled
Details
CI / vm_tests (NetBSD, false, netbsd, 10.1) (push) Has been cancelled
Details
CI / vm_tests (OpenBSD, false, openbsd, 7.7) (push) Has been cancelled
Details
CI / vm_tests (borg-freebsd-14-x86_64-gh, FreeBSD, true, freebsd, 14.3) (push) Has been cancelled
Details
CI / windows_tests (push) Has been cancelled
Details

Browse source 
netbsd/freebsd: work around test issues
This commit is contained in:
TW 2025-11-10 00:57:15 +01:00 committed by GitHub
commit 1373b30ba8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/borg/platformflags.py
View file

@ -11,4 +11,6 @@ is_cygwin = sys.platform.startswith("cygwin")
is_linux = sys.platform.startswith("linux")
is_freebsd = sys.platform.startswith("freebsd")
is_netbsd = sys.platform.startswith("netbsd")
is_openbsd = sys.platform.startswith("openbsd")
is_darwin = sys.platform.startswith("darwin")

10
src/borg/testsuite/archiver/diff_cmd_test.py
View file

@ -7,7 +7,7 @@ import pytest
from ...constants import * # NOQA
from .. import are_symlinks_supported, are_hardlinks_supported, granularity_sleep
from ...platformflags import is_win32
from ...platformflags import is_win32, is_freebsd, is_netbsd
from . import (
cmd,
create_regular_file,
@ -176,7 +176,8 @@ def test_basic_functionality(archivers, request):
assert unexpected not in get_changes("input/file_touched", joutput)
if not content_only:
# on win32, ctime is the file creation time and does not change.
expected = {"mtime"} if is_win32 else {"mtime", "ctime"}
# not sure why netbsd only has mtime, but it does, #8703.
expected = {"mtime"} if (is_win32 or is_netbsd) else {"mtime", "ctime"}
assert expected.issubset({c["type"] for c in get_changes("input/file_touched", joutput)})
else:
# And if we're doing content-only, don't show the file at all.
@ -426,7 +427,10 @@ def test_sort_by_all_keys_with_directions(archivers, request, sort_key):
assert seen_paths == expected_paths
@pytest.mark.skipif(not are_hardlinks_supported(), reason="hardlinks not supported")
@pytest.mark.skipif(
not are_hardlinks_supported() or is_freebsd or is_netbsd,
reason="hardlinks not supported or test failing on freebsd and netbsd",
)
def test_hard_link_deletion_and_replacement(archivers, request):
archiver = request.getfixturevalue(archivers)