Skip to content

tests: fix inode-order dependence in test_multiple_link_exclusion, fixes #8740 #10152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ThomasWaldmann merged 1 commit into from
Aug 18, 2026
Merged

tests: fix inode-order dependence in test_multiple_link_exclusion, fixes #8740 #10152

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions src/borg/testsuite/archiver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5450,10 +5450,6 @@ def test_time_diffs(self):


@requires_hardlinks
@pytest.mark.skipif(
(not are_hardlinks_supported()) or is_freebsd or is_netbsd,
reason='Skip when hardlinks unsupported or on FreeBSD/NetBSD due to differing ctime/link handling; see #9147, #9153.',
)
def test_multiple_link_exclusion(self):
path_a = os.path.join(self.input_path, 'a')
path_b = os.path.join(self.input_path, 'b')
Expand All @@ -5463,12 +5459,20 @@ def test_multiple_link_exclusion(self):
hl_b = os.path.join(path_b, 'hardlink')
self.create_regular_file(hl_a, contents=b'123456')
os.link(hl_a, hl_b)
# create processes dir entries in inode order (scandir_inorder), so the hardlink in the
# dir with the lower inode number becomes the hardlink master. dirs do not necessarily
# get their inode numbers assigned in creation order (e.g. ufs dirpref spreads dirs over
# cylinder groups), so determine master/slave from the actual inode numbers, see #8740.
if os.stat(path_a).st_ino < os.stat(path_b).st_ino:
hl_master, slave_dir = hl_a, 'b'
else:
hl_master, slave_dir = hl_b, 'a'
self.cmd('init', '--encryption=repokey', self.repository_location)
self.cmd('create', self.repository_location + '::test0', 'input')
os.unlink(hl_a) # Don't duplicate warning message- one is enough.
os.unlink(hl_master) # Don't duplicate warning message- one is enough.
self.cmd('create', self.repository_location + '::test1', 'input')

output = self.cmd('diff', '--pattern=+ fm:input/b', '--pattern=! **/', self.repository_location + '::test0', 'test1', exit_code=EXIT_WARNING)
output = self.cmd('diff', '--pattern=+ fm:input/' + slave_dir, '--pattern=! **/', self.repository_location + '::test0', 'test1', exit_code=EXIT_WARNING)
lines = output.splitlines()
self.assert_line_exists(lines, 'cannot find hardlink source for.*skipping compare.')

Expand Down
Loading