upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-06-15 12:34:34 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

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

Browse source 
improve/clarify strange test code, fixes #6070
This commit is contained in:
TW 2022-11-05 02:15:25 +01:00 committed by GitHub
commit fff56edd8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/borg/testsuite/archiver.py
View file

@ -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: