Просмотр исходного кода

fixup: tests

(cherry picked from commit 835fede85f15956a5b9650f33790c7e665950ca1)
Thomas Waldmann 7 лет назад
Родитель
Сommit
21742faf26
1 измененных файлов с 3 добавлено и 7 удалено
  1. 3 7
      src/borg/testsuite/archiver.py

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

@@ -3331,13 +3331,9 @@ class ArchiverCorruptionTestCase(ArchiverTestCaseBase):
     def test_cache_files(self):
     def test_cache_files(self):
         self.cmd('create', self.repository_location + '::test', 'input')
         self.cmd('create', self.repository_location + '::test', 'input')
         self.corrupt(os.path.join(self.cache_path, 'files'))
         self.corrupt(os.path.join(self.cache_path, 'files'))
-
-        if self.FORK_DEFAULT:
-            out = self.cmd('create', self.repository_location + '::test1', 'input', exit_code=2)
-            assert 'failed integrity check' in out
-        else:
-            with pytest.raises(FileIntegrityError):
-                self.cmd('create', self.repository_location + '::test1', 'input')
+        out = self.cmd('create', self.repository_location + '::test1', 'input')
+        # borg warns about the corrupt files cache, but then continues without files cache.
+        assert 'files cache is corrupted' in out
 
 
     def test_chunks_archive(self):
     def test_chunks_archive(self):
         self.cmd('create', self.repository_location + '::test1', 'input')
         self.cmd('create', self.repository_location + '::test1', 'input')