diff options
| author | Tulio Casagrande <tcasagra@thoughtworks.com> | 2017-01-10 13:42:41 -0200 |
|---|---|---|
| committer | Tulio Casagrande <tcasagra@thoughtworks.com> | 2017-01-10 13:49:29 -0200 |
| commit | 71a5f5150b5e9d7cb402e4424930545896a13727 (patch) | |
| tree | a1608740b9e94ffce720a32aa3ee0fc264ccc7ac /service/test/unit | |
| parent | 67f06daab61be9ec763fd228cf51a4d3f9c091a3 (diff) | |
Fix regenerate keys test flow
The regenerate key test was not checking if the UploadKeyError exception
was raised
Related with: #815
Diffstat (limited to 'service/test/unit')
| -rw-r--r-- | service/test/unit/bitmask_libraries/test_keymanager.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/service/test/unit/bitmask_libraries/test_keymanager.py b/service/test/unit/bitmask_libraries/test_keymanager.py index 81ba7b65..1fad9df6 100644 --- a/service/test/unit/bitmask_libraries/test_keymanager.py +++ b/service/test/unit/bitmask_libraries/test_keymanager.py @@ -115,7 +115,7 @@ class KeymanagerTest(TestCase): @defer.inlineCallbacks def test_keymanager_regenerate_key_pair_if_current_key_is_about_to_expire(self): mock_open_pgp_key = MagicMock() - mock_open_pgp_key.needs_renewal.return_value(True) + mock_open_pgp_key.needs_renewal = MagicMock(return_value=True) when(self.keymanager)._key_exists('test_user@some-server.test').thenReturn(mock_open_pgp_key) yield self.keymanager.generate_openpgp_key() @@ -126,9 +126,9 @@ class KeymanagerTest(TestCase): @defer.inlineCallbacks def test_key_regeneration_does_not_delete_key_when_upload_fails(self): mock_open_pgp_key = MagicMock() - mock_open_pgp_key.needs_renewal.return_value(True) - self.leap_keymanager.get_key = MagicMock(return_value=defer.succeed(mock_open_pgp_key)) - self.leap_keymanager.send_key = MagicMock(side_effect=UploadKeyError('Could not upload key')) + mock_open_pgp_key.needs_renewal = MagicMock(return_value=True) + when(self.keymanager)._key_exists('test_user@some-server.test').thenReturn(mock_open_pgp_key) + when(self.leap_keymanager).send_key().thenRaise(Exception('Could not upload key')) self.keymanager.delete_key_pair = MagicMock() |