浏览代码

move lock cmd tests to own module

Thomas Waldmann 2 年之前
父节点
当前提交
35d2710769
共有 2 个文件被更改,包括 15 次插入10 次删除
  1. 0 10
      src/borg/testsuite/archiver/__init__.py
  2. 15 0
      src/borg/testsuite/archiver/lock_cmds.py

+ 0 - 10
src/borg/testsuite/archiver/__init__.py

@@ -1935,10 +1935,6 @@ class ArchiverTestCase(ArchiverTestCaseBase):
         log = self.cmd(f"--repo={self.repository_location}", "--debug", "create", "test", "input")
         assert "security: read previous location" in log
 
-    def test_break_lock(self):
-        self.cmd(f"--repo={self.repository_location}", "rcreate", RK_ENCRYPTION)
-        self.cmd(f"--repo={self.repository_location}", "break-lock")
-
     def test_usage(self):
         self.cmd()
         self.cmd("-h")
@@ -2000,12 +1996,6 @@ class ArchiverTestCase(ArchiverTestCaseBase):
         with pytest.raises(AssertionError):
             self.check_cache()
 
-    def test_with_lock(self):
-        self.cmd(f"--repo={self.repository_location}", "rcreate", RK_ENCRYPTION)
-        lock_path = os.path.join(self.repository_path, "lock.exclusive")
-        cmd = "python3", "-c", 'import os, sys; sys.exit(42 if os.path.exists("%s") else 23)' % lock_path
-        self.cmd(f"--repo={self.repository_location}", "with-lock", *cmd, fork=True, exit_code=42)
-
     def test_bad_filters(self):
         self.cmd(f"--repo={self.repository_location}", "rcreate", RK_ENCRYPTION)
         self.cmd(f"--repo={self.repository_location}", "create", "test", "input")

+ 15 - 0
src/borg/testsuite/archiver/lock_cmds.py

@@ -0,0 +1,15 @@
+import os
+from ...constants import *  # NOQA
+from . import ArchiverTestCaseBase, RK_ENCRYPTION
+
+
+class ArchiverTestCase(ArchiverTestCaseBase):
+    def test_break_lock(self):
+        self.cmd(f"--repo={self.repository_location}", "rcreate", RK_ENCRYPTION)
+        self.cmd(f"--repo={self.repository_location}", "break-lock")
+
+    def test_with_lock(self):
+        self.cmd(f"--repo={self.repository_location}", "rcreate", RK_ENCRYPTION)
+        lock_path = os.path.join(self.repository_path, "lock.exclusive")
+        cmd = "python3", "-c", 'import os, sys; sys.exit(42 if os.path.exists("%s") else 23)' % lock_path
+        self.cmd(f"--repo={self.repository_location}", "with-lock", *cmd, fork=True, exit_code=42)