소스 검색

xattr key names must start with user. on linux

... or the call will just error with "operation not supported"

(cherry picked from commit 53971e8e79c515e942eb4acdb9d19d002779e5e9)
Thomas Waldmann 6 년 전
부모
커밋
60347a4dd6
1개의 변경된 파일3개의 추가작업 그리고 3개의 파일을 삭제
  1. 3 3
      src/borg/testsuite/archiver.py

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

@@ -1256,14 +1256,14 @@ class ArchiverTestCase(ArchiverTestCaseBase):
             raise OSError(errno.EACCES, 'EACCES')
             raise OSError(errno.EACCES, 'EACCES')
 
 
         self.create_regular_file('file')
         self.create_regular_file('file')
-        xattr.setxattr('input/file', 'attribute', 'value')
+        xattr.setxattr('input/file', 'user.attribute', 'value')
         self.cmd('init', self.repository_location, '-e' 'none')
         self.cmd('init', self.repository_location, '-e' 'none')
         self.cmd('create', self.repository_location + '::test', 'input')
         self.cmd('create', self.repository_location + '::test', 'input')
         with changedir('output'):
         with changedir('output'):
             input_abspath = os.path.abspath('input/file')
             input_abspath = os.path.abspath('input/file')
             with patch.object(xattr, 'setxattr', patched_setxattr_E2BIG):
             with patch.object(xattr, 'setxattr', patched_setxattr_E2BIG):
                 out = self.cmd('extract', self.repository_location + '::test', exit_code=EXIT_WARNING)
                 out = self.cmd('extract', self.repository_location + '::test', exit_code=EXIT_WARNING)
-                assert out == (input_abspath + ': Value or key of extended attribute attribute is too big for this '
+                assert out == (input_abspath + ': Value or key of extended attribute user.attribute is too big for this '
                                                'filesystem\n')
                                                'filesystem\n')
             os.remove(input_abspath)
             os.remove(input_abspath)
             with patch.object(xattr, 'setxattr', patched_setxattr_ENOTSUP):
             with patch.object(xattr, 'setxattr', patched_setxattr_ENOTSUP):
@@ -1272,7 +1272,7 @@ class ArchiverTestCase(ArchiverTestCaseBase):
             os.remove(input_abspath)
             os.remove(input_abspath)
             with patch.object(xattr, 'setxattr', patched_setxattr_EACCES):
             with patch.object(xattr, 'setxattr', patched_setxattr_EACCES):
                 out = self.cmd('extract', self.repository_location + '::test', exit_code=EXIT_WARNING)
                 out = self.cmd('extract', self.repository_location + '::test', exit_code=EXIT_WARNING)
-                assert out == (input_abspath + ': Permission denied when setting extended attribute attribute\n')
+                assert out == (input_abspath + ': Permission denied when setting extended attribute user.attribute\n')
             assert os.path.isfile(input_abspath)
             assert os.path.isfile(input_abspath)
 
 
     def test_path_normalization(self):
     def test_path_normalization(self):