فهرست منبع

Fix ArchiverTestCaseBinary.test_init_refuse_to_overwrite_keyfile

Andrey Bienkowski 3 سال پیش
والد
کامیت
365c1c8b5d
1فایلهای تغییر یافته به همراه6 افزوده شده و 2 حذف شده
  1. 6 2
      src/borg/testsuite/archiver.py

+ 6 - 2
src/borg/testsuite/archiver.py

@@ -2582,8 +2582,12 @@ class ArchiverTestCase(ArchiverTestCaseBase):
             self.cmd('init', '--encryption=keyfile', self.repository_location + '0')
             self.cmd('init', '--encryption=keyfile', self.repository_location + '0')
             with open(keyfile) as file:
             with open(keyfile) as file:
                 before = file.read()
                 before = file.read()
-            with pytest.raises(borg.helpers.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.Error):
+                    self.cmd(*arg)
             with open(keyfile) as file:
             with open(keyfile) as file:
                 after = file.read()
                 after = file.read()
             assert before == after
             assert before == after