mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-03-10 14:15:43 +00:00
Code Issues Releases Wiki Activity

Merge pull request #7471 from Michael-Girma/bug/issue-7470

Browse source 
Resolved mode bug and added sleep clause for darwin systems. Fixes #7470
This commit is contained in:
TW 2023-03-23 21:29:56 +01:00 • committed by GitHub
commit 05bfed50c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/borg/testsuite/archiver.py
View file

@ -4523,12 +4523,16 @@ class DiffArchiverTestCase(ArchiverTestCaseBase):
if is_win32: if is_win32:
# Sleeping for 15s because Windows doesn't refresh ctime if file is deleted and recreated within 15 seconds. # Sleeping for 15s because Windows doesn't refresh ctime if file is deleted and recreated within 15 seconds.
time.sleep(15) time.sleep(15)
elif is_darwin:
time.sleep(1) # HFS has a 1s timestamp granularity
self.create_regular_file("test_file", size=15) self.create_regular_file("test_file", size=15)
self.cmd('create', self.repository_location + '::archive2', 'input') self.cmd('create', self.repository_location + '::archive2', 'input')
output = self.cmd("diff", self.repository_location + "::archive1", "archive2") output = self.cmd("diff", self.repository_location + "::archive1", "archive2")
self.assert_in("mtime", output) self.assert_in("mtime", output)
self.assert_in("ctime", output) # Should show up on windows as well since it is a new file. self.assert_in("ctime", output) # Should show up on windows as well since it is a new file.
os.chmod("input/test_file", 777) if is_darwin:
time.sleep(1) # HFS has a 1s timestamp granularity
os.chmod("input/test_file", 0o777)
self.cmd('create', self.repository_location + '::archive3', 'input') self.cmd('create', self.repository_location + '::archive3', 'input')
output = self.cmd("diff", self.repository_location + "::archive2", "archive3") output = self.cmd("diff", self.repository_location + "::archive2", "archive3")
self.assert_not_in("mtime", output) self.assert_not_in("mtime", output)