From 21742faf2645447502510f2f9713956bbe285cdd Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 20 Jan 2018 13:34:46 +0100 Subject: [PATCH] fixup: tests (cherry picked from commit 835fede85f15956a5b9650f33790c7e665950ca1) --- src/borg/testsuite/archiver.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/borg/testsuite/archiver.py b/src/borg/testsuite/archiver.py index b3383e975..0864c773a 100644 --- a/src/borg/testsuite/archiver.py +++ b/src/borg/testsuite/archiver.py @@ -3331,13 +3331,9 @@ def test_cache_chunks(self): def test_cache_files(self): self.cmd('create', self.repository_location + '::test', 'input') 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): self.cmd('create', self.repository_location + '::test1', 'input')