From 620d51d6bc1135e88620639eff4c375e9be247d1 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Mon, 12 Sep 2022 21:59:41 +0200 Subject: [PATCH] move rename cmd tests to own module --- src/borg/testsuite/archiver/__init__.py | 20 ----------------- src/borg/testsuite/archiver/rename_cmd.py | 26 +++++++++++++++++++++++ 2 files changed, 26 insertions(+), 20 deletions(-) create mode 100644 src/borg/testsuite/archiver/rename_cmd.py diff --git a/src/borg/testsuite/archiver/__init__.py b/src/borg/testsuite/archiver/__init__.py index cc1a28fbd..ec8a88f40 100644 --- a/src/borg/testsuite/archiver/__init__.py +++ b/src/borg/testsuite/archiver/__init__.py @@ -1604,26 +1604,6 @@ class ArchiverTestCase(ArchiverTestCaseBase): with changedir("output"): self.cmd(f"--repo={self.repository_location}", "extract", "test", exit_code=1) - def test_rename(self): - self.create_regular_file("file1", size=1024 * 80) - self.create_regular_file("dir2/file2", size=1024 * 80) - self.cmd(f"--repo={self.repository_location}", "rcreate", RK_ENCRYPTION) - self.cmd(f"--repo={self.repository_location}", "create", "test", "input") - self.cmd(f"--repo={self.repository_location}", "create", "test.2", "input") - self.cmd(f"--repo={self.repository_location}", "extract", "test", "--dry-run") - self.cmd(f"--repo={self.repository_location}", "extract", "test.2", "--dry-run") - self.cmd(f"--repo={self.repository_location}", "rename", "test", "test.3") - self.cmd(f"--repo={self.repository_location}", "extract", "test.2", "--dry-run") - self.cmd(f"--repo={self.repository_location}", "rename", "test.2", "test.4") - self.cmd(f"--repo={self.repository_location}", "extract", "test.3", "--dry-run") - self.cmd(f"--repo={self.repository_location}", "extract", "test.4", "--dry-run") - # Make sure both archives have been renamed - with Repository(self.repository_path) as repository: - manifest = Manifest.load(repository, Manifest.NO_OPERATION_CHECK) - self.assert_equal(len(manifest.archives), 2) - self.assert_in("test.3", manifest.archives) - self.assert_in("test.4", manifest.archives) - def test_info(self): self.create_regular_file("file1", size=1024 * 80) self.cmd(f"--repo={self.repository_location}", "rcreate", RK_ENCRYPTION) diff --git a/src/borg/testsuite/archiver/rename_cmd.py b/src/borg/testsuite/archiver/rename_cmd.py new file mode 100644 index 000000000..1c05ca128 --- /dev/null +++ b/src/borg/testsuite/archiver/rename_cmd.py @@ -0,0 +1,26 @@ +from ...constants import * # NOQA +from ...manifest import Manifest +from ...repository import Repository +from . import ArchiverTestCaseBase, RK_ENCRYPTION + + +class ArchiverTestCase(ArchiverTestCaseBase): + def test_rename(self): + self.create_regular_file("file1", size=1024 * 80) + self.create_regular_file("dir2/file2", size=1024 * 80) + self.cmd(f"--repo={self.repository_location}", "rcreate", RK_ENCRYPTION) + self.cmd(f"--repo={self.repository_location}", "create", "test", "input") + self.cmd(f"--repo={self.repository_location}", "create", "test.2", "input") + self.cmd(f"--repo={self.repository_location}", "extract", "test", "--dry-run") + self.cmd(f"--repo={self.repository_location}", "extract", "test.2", "--dry-run") + self.cmd(f"--repo={self.repository_location}", "rename", "test", "test.3") + self.cmd(f"--repo={self.repository_location}", "extract", "test.2", "--dry-run") + self.cmd(f"--repo={self.repository_location}", "rename", "test.2", "test.4") + self.cmd(f"--repo={self.repository_location}", "extract", "test.3", "--dry-run") + self.cmd(f"--repo={self.repository_location}", "extract", "test.4", "--dry-run") + # Make sure both archives have been renamed + with Repository(self.repository_path) as repository: + manifest = Manifest.load(repository, Manifest.NO_OPERATION_CHECK) + self.assert_equal(len(manifest.archives), 2) + self.assert_in("test.3", manifest.archives) + self.assert_in("test.4", manifest.archives)