From 25d6649bcd1bcaa7b4481da38f93f7f7ad0a3a90 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 5 Nov 2022 00:46:40 +0100 Subject: [PATCH] improve/clarify strange test code, fixes #6070 --- 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 161469b85..60ce9baa3 100644 --- a/src/borg/testsuite/archiver.py +++ b/src/borg/testsuite/archiver.py @@ -1854,15 +1854,11 @@ class ArchiverTestCase(ArchiverTestCaseBase): @pytest.mark.allow_cache_wipe def test_unknown_mandatory_feature_in_cache(self): - if self.prefix: - path_prefix = 'ssh://__testsuite__' - else: - path_prefix = '' - + remote_repo = bool(self.prefix) print(self.cmd('init', '--encryption=repokey', self.repository_location)) with Repository(self.repository_path, exclusive=True) as repository: - if path_prefix: + if remote_repo: repository._location = Location(self.repository_location) manifest, key = Manifest.load(repository, Manifest.NO_OPERATION_CHECK) with Cache(repository, key, manifest) as cache: @@ -1887,7 +1883,7 @@ class ArchiverTestCase(ArchiverTestCaseBase): assert called with Repository(self.repository_path, exclusive=True) as repository: - if path_prefix: + if remote_repo: repository._location = Location(self.repository_location) manifest, key = Manifest.load(repository, Manifest.NO_OPERATION_CHECK) with Cache(repository, key, manifest) as cache: