Browse Source

Merge pull request #7130 from ThomasWaldmann/fix-6070-1.2

improve/clarify strange test code, fixes #6070
TW 2 years ago
parent
commit
fff56edd8a
1 changed files with 3 additions and 7 deletions
  1. 3 7
      src/borg/testsuite/archiver.py

+ 3 - 7
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: