浏览代码

Merge pull request #6808 from ThomasWaldmann/no-symlinked-hardlinks-macos-borg2

macOS does not support hardlinking symlinks, fixes #6802
TW 3 年之前
父节点
当前提交
f2d276a892
共有 1 个文件被更改,包括 3 次插入3 次删除
  1. 3 3
      src/borg/testsuite/archiver.py

+ 3 - 3
src/borg/testsuite/archiver.py

@@ -56,7 +56,7 @@ from ..repository import Repository
 from . import has_lchflags, llfuse
 from . import has_lchflags, llfuse
 from . import BaseTestCase, changedir, environment_variable, no_selinux
 from . import BaseTestCase, changedir, environment_variable, no_selinux
 from . import are_symlinks_supported, are_hardlinks_supported, are_fifos_supported, is_utime_fully_supported, is_birthtime_fully_supported
 from . import are_symlinks_supported, are_hardlinks_supported, are_fifos_supported, is_utime_fully_supported, is_birthtime_fully_supported
-from .platform import fakeroot_detected
+from .platform import fakeroot_detected, is_darwin
 from . import key
 from . import key
 
 
 
 
@@ -505,8 +505,8 @@ class ArchiverTestCase(ArchiverTestCaseBase):
             self.cmd(f'--repo={self.repository_location}', 'extract', 'test')
             self.cmd(f'--repo={self.repository_location}', 'extract', 'test')
             assert os.readlink('input/link1') == 'somewhere'
             assert os.readlink('input/link1') == 'somewhere'
 
 
-    @pytest.mark.skipif(not are_symlinks_supported() or not are_hardlinks_supported(),
-                        reason='symlinks or hardlinks not supported')
+    @pytest.mark.skipif(not are_symlinks_supported() or not are_hardlinks_supported() or is_darwin,
+                        reason='symlinks or hardlinks or hardlinked symlinks not supported')
     def test_hardlinked_symlinks_extract(self):
     def test_hardlinked_symlinks_extract(self):
         self.create_regular_file('target', size=1024)
         self.create_regular_file('target', size=1024)
         with changedir('input'):
         with changedir('input'):