From e21343d2a81376e547cd0edbcae01e64e4ab3f81 Mon Sep 17 00:00:00 2001 From: Andrey Bienkowski Date: Sat, 5 Feb 2022 22:18:52 +0300 Subject: [PATCH] Fix ArchiverTestCaseBinary.test_init_refuse_to_overwrite_keyfile --- src/borg/testsuite/archiver.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/borg/testsuite/archiver.py b/src/borg/testsuite/archiver.py index 133d4f3e0..11d83525d 100644 --- a/src/borg/testsuite/archiver.py +++ b/src/borg/testsuite/archiver.py @@ -2874,8 +2874,12 @@ class ArchiverTestCase(ArchiverTestCaseBase): self.cmd('init', '--encryption=keyfile', self.repository_location + '0') with open(keyfile) as file: before = file.read() - with pytest.raises(borg.helpers.errors.Error): - self.cmd('init', '--encryption=keyfile', self.repository_location + '1') + arg = ('init', '--encryption=keyfile', self.repository_location + '1') + if self.FORK_DEFAULT: + self.cmd(*arg, exit_code=2) + else: + with pytest.raises(borg.helpers.errors.Error): + self.cmd(*arg) with open(keyfile) as file: after = file.read() assert before == after