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

testsuite.archiver: normalise pytest.raises vs. assert_raises

This commit is contained in:
Marian Beermann 2017-05-07 22:21:40 +02:00
parent d964101eb5
commit 1daab244c6
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/borg/testsuite/archiver.py
View File

@ -560,7 +560,8 @@ class ArchiverTestCase(ArchiverTestCaseBase):
if self.FORK_DEFAULT: if self.FORK_DEFAULT:
self.cmd('create', self.repository_location + '::test.2', 'input', exit_code=EXIT_ERROR) self.cmd('create', self.repository_location + '::test.2', 'input', exit_code=EXIT_ERROR)
else: else:
self.assert_raises(Cache.EncryptionMethodMismatch, lambda: self.cmd('create', self.repository_location + '::test.2', 'input')) with pytest.raises(Cache.EncryptionMethodMismatch):
self.cmd('create', self.repository_location + '::test.2', 'input')
def test_repository_swap_detection2(self): def test_repository_swap_detection2(self):
self.create_test_files() self.create_test_files()
@ -573,7 +574,8 @@ class ArchiverTestCase(ArchiverTestCaseBase):
if self.FORK_DEFAULT: if self.FORK_DEFAULT:
self.cmd('create', self.repository_location + '_encrypted::test.2', 'input', exit_code=EXIT_ERROR) self.cmd('create', self.repository_location + '_encrypted::test.2', 'input', exit_code=EXIT_ERROR)
else: else:
self.assert_raises(Cache.RepositoryAccessAborted, lambda: self.cmd('create', self.repository_location + '_encrypted::test.2', 'input')) with pytest.raises(Cache.RepositoryAccessAborted):
self.cmd('create', self.repository_location + '_encrypted::test.2', 'input')
def test_repository_swap_detection_no_cache(self): def test_repository_swap_detection_no_cache(self):
self.create_test_files() self.create_test_files()
@ -589,7 +591,8 @@ class ArchiverTestCase(ArchiverTestCaseBase):
if self.FORK_DEFAULT: if self.FORK_DEFAULT:
self.cmd('create', self.repository_location + '::test.2', 'input', exit_code=EXIT_ERROR) self.cmd('create', self.repository_location + '::test.2', 'input', exit_code=EXIT_ERROR)
else: else:
self.assert_raises(Cache.EncryptionMethodMismatch, lambda: self.cmd('create', self.repository_location + '::test.2', 'input')) with pytest.raises(Cache.EncryptionMethodMismatch):
self.cmd('create', self.repository_location + '::test.2', 'input')
def test_repository_swap_detection2_no_cache(self): def test_repository_swap_detection2_no_cache(self):
self.create_test_files() self.create_test_files()
@ -628,7 +631,8 @@ class ArchiverTestCase(ArchiverTestCaseBase):
if self.FORK_DEFAULT: if self.FORK_DEFAULT:
self.cmd('create', self.repository_location + '::test.2', 'input', exit_code=EXIT_ERROR) self.cmd('create', self.repository_location + '::test.2', 'input', exit_code=EXIT_ERROR)
else: else:
self.assert_raises(Cache.CacheInitAbortedError, lambda: self.cmd('create', self.repository_location + '::test.2', 'input')) with pytest.raises(Cache.CacheInitAbortedError):
self.cmd('create', self.repository_location + '::test.2', 'input')
def test_repository_move(self): def test_repository_move(self):
self.cmd('init', '--encryption=repokey', self.repository_location) self.cmd('init', '--encryption=repokey', self.repository_location)
@ -2255,7 +2259,8 @@ class ArchiverTestCase(ArchiverTestCaseBase):
if self.FORK_DEFAULT: if self.FORK_DEFAULT:
self.cmd('key', 'import', self.repository_location, export_file, exit_code=2) self.cmd('key', 'import', self.repository_location, export_file, exit_code=2)
else: else:
self.assert_raises(NotABorgKeyFile, lambda: self.cmd('key', 'import', self.repository_location, export_file)) with pytest.raises(NotABorgKeyFile):
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')
@ -2263,7 +2268,8 @@ class ArchiverTestCase(ArchiverTestCaseBase):
if self.FORK_DEFAULT: if self.FORK_DEFAULT:
self.cmd('key', 'import', self.repository_location, export_file, exit_code=2) self.cmd('key', 'import', self.repository_location, export_file, exit_code=2)
else: else:
self.assert_raises(RepoIdMismatch, lambda: self.cmd('key', 'import', self.repository_location, export_file)) with pytest.raises(RepoIdMismatch):
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'
@ -2676,13 +2682,13 @@ class RemoteArchiverTestCase(ArchiverTestCase):
self.cmd('init', '--encryption=repokey', self.repository_location) self.cmd('init', '--encryption=repokey', self.repository_location)
# restricted to repo directory itself, fail for other directories with same prefix: # restricted to repo directory itself, fail for other directories with same prefix:
with patch.object(RemoteRepository, 'extra_test_args', ['--restrict-to-path', self.repository_path]): with patch.object(RemoteRepository, 'extra_test_args', ['--restrict-to-path', self.repository_path]):
self.assert_raises(PathNotAllowed, with pytest.raises(PathNotAllowed):
lambda: self.cmd('init', '--encryption=repokey', self.repository_location + '_0')) self.cmd('init', '--encryption=repokey', self.repository_location + '_0')
# restricted to a completely different path: # restricted to a completely different path:
with patch.object(RemoteRepository, 'extra_test_args', ['--restrict-to-path', '/foo']): with patch.object(RemoteRepository, 'extra_test_args', ['--restrict-to-path', '/foo']):
self.assert_raises(PathNotAllowed, with pytest.raises(PathNotAllowed):
lambda: self.cmd('init', '--encryption=repokey', self.repository_location + '_1')) self.cmd('init', '--encryption=repokey', self.repository_location + '_1')
path_prefix = os.path.dirname(self.repository_path) path_prefix = os.path.dirname(self.repository_path)
# restrict to repo directory's parent directory: # restrict to repo directory's parent directory:
with patch.object(RemoteRepository, 'extra_test_args', ['--restrict-to-path', path_prefix]): with patch.object(RemoteRepository, 'extra_test_args', ['--restrict-to-path', path_prefix]):