mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1646 from textshell/fix/key-import-tests 

Fix key import tests
This commit is contained in:
TW 2016-09-26 20:02:10 +02:00 committed by GitHub
parent e9486ec348 15444b19d1
commit 1449c31c03
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
borg/testsuite/archiver.py
View File

@ -69,7 +69,7 @@ def exec_cmd(*args, archiver=None, fork=False, exe=None, **kw):
sys.stdin, sys.stdout, sys.stderr = stdin, stdout, stderr sys.stdin, sys.stdout, sys.stderr = stdin, stdout, stderr
# check if the binary "borg.exe" is available # check if the binary "borg.exe" is available (for local testing a symlink to virtualenv/bin/borg should do)
try: try:
exec_cmd('help', exe='borg.exe', fork=True) exec_cmd('help', exe='borg.exe', fork=True)
BORG_EXES = ['python', 'binary', ] BORG_EXES = ['python', 'binary', ]
@ -1263,12 +1263,18 @@ class ArchiverTestCase(ArchiverTestCaseBase):
with open(export_file, 'w') as fd: with open(export_file, 'w') as fd:
fd.write('something not a key\n') fd.write('something not a key\n')
self.assert_raises(NotABorgKeyFile, lambda: self.cmd('key', 'import', self.repository_location, export_file)) if self.FORK_DEFAULT:
self.cmd('key', 'import', self.repository_location, export_file, exit_code=2)
else:
self.assert_raises(NotABorgKeyFile, lambda: self.cmd('key', 'import', self.repository_location, export_file))
with open(export_file, 'w') as fd: with open(export_file, 'w') as fd:
fd.write('BORG_KEY a0a0a0\n') fd.write('BORG_KEY a0a0a0\n')
self.assert_raises(RepoIdMismatch, lambda: self.cmd('key', 'import', self.repository_location, export_file)) if self.FORK_DEFAULT:
self.cmd('key', 'import', self.repository_location, export_file, exit_code=2)
else:
self.assert_raises(RepoIdMismatch, lambda: self.cmd('key', 'import', self.repository_location, export_file))
def test_key_export_paperkey(self): def test_key_export_paperkey(self):
repo_id = 'e294423506da4e1ea76e8dcdf1a3919624ae3ae496fddf905610c351d3f09239' repo_id = 'e294423506da4e1ea76e8dcdf1a3919624ae3ae496fddf905610c351d3f09239'