From 71a5f5150b5e9d7cb402e4424930545896a13727 Mon Sep 17 00:00:00 2001 From: Tulio Casagrande Date: Tue, 10 Jan 2017 13:42:41 -0200 Subject: Fix regenerate keys test flow The regenerate key test was not checking if the UploadKeyError exception was raised Related with: #815 --- service/test/unit/bitmask_libraries/test_keymanager.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'service/test/unit') 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() -- cgit v1.2.3