summaryrefslogtreecommitdiff
path: root/service/test/unit/bitmask_libraries
diff options
context:
space:
mode:
authorTulio Casagrande <tcasagra@thoughtworks.com>2017-01-09 16:13:39 -0200
committerTulio Casagrande <tcasagra@thoughtworks.com>2017-01-09 16:13:39 -0200
commitbc84433a06a742c3b29e115fb9e88c86df0f2b1c (patch)
tree6295f79bb5c99e7931e7e56b026aebe472621dd6 /service/test/unit/bitmask_libraries
parent6cbc4b8624e165bdedada83637e1a228247407ef (diff)
Log user's current key for easier debug
Related with: #815
Diffstat (limited to 'service/test/unit/bitmask_libraries')
-rw-r--r--service/test/unit/bitmask_libraries/test_keymanager.py20
1 files changed, 10 insertions, 10 deletions
diff --git a/service/test/unit/bitmask_libraries/test_keymanager.py b/service/test/unit/bitmask_libraries/test_keymanager.py
index eb6ba79b..81ba7b65 100644
--- a/service/test/unit/bitmask_libraries/test_keymanager.py
+++ b/service/test/unit/bitmask_libraries/test_keymanager.py
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU Affero General Public License
# along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
-import datetime
+
from mock import patch, MagicMock
from mockito import when
from unittest import TestCase
@@ -70,42 +70,42 @@ class KeymanagerTest(TestCase):
def test_keymanager_generate_openpgp_key_generates_key_correctly(self):
when(self.keymanager)._key_exists('test_user@some-server.test').thenReturn(None)
- self.keymanager._gen_key = MagicMock()
- self.keymanager._send_key_to_leap = MagicMock()
+ self.leap_keymanager.gen_key = MagicMock()
+ self.leap_keymanager.send_key = MagicMock()
self.keymanager.generate_openpgp_key()
- self.keymanager._gen_key.assert_called_once()
- self.keymanager._send_key_to_leap.assert_called_once()
+ self.leap_keymanager.gen_key.assert_called_once()
+ self.leap_keymanager.send_key.assert_called_once()
def test_keymanager_generate_openpgp_key_doesnt_regenerate_preexisting_key(self):
mock_open_pgp_key = MagicMock()
mock_open_pgp_key.needs_renewal = MagicMock(return_value=False)
when(self.keymanager)._key_exists('test_user@some-server.test').thenReturn(mock_open_pgp_key)
- self.keymanager._gen_key = MagicMock()
+ self.leap_keymanager.gen_key = MagicMock()
self.keymanager.generate_openpgp_key()
- self.keymanager._gen_key.assert_not_called()
+ self.leap_keymanager.gen_key.assert_not_called()
def test_keymanager_generate_openpgp_key_doesnt_upload_preexisting_key(self):
mock_open_pgp_key = MagicMock()
mock_open_pgp_key.needs_renewal = MagicMock(return_value=False)
when(self.keymanager)._key_exists('test_user@some-server.test').thenReturn(mock_open_pgp_key)
- self.keymanager._send_key_to_leap = MagicMock()
+ self.leap_keymanager.send_key = MagicMock()
self.keymanager.generate_openpgp_key()
- self.keymanager._send_key_to_leap.assert_not_called()
+ self.leap_keymanager.send_key.assert_not_called()
@defer.inlineCallbacks
def test_keymanager_generate_openpgp_key_deletes_key_when_upload_fails(self):
when(self.keymanager)._key_exists('test_user@some-server.test').thenReturn(None)
self.keymanager.delete_key_pair = MagicMock()
- when(self.keymanager)._send_key_to_leap().thenRaise(Exception('Could not upload key'))
+ when(self.leap_keymanager).send_key().thenRaise(Exception('Could not upload key'))
with self.assertRaises(UploadKeyError):
yield self.keymanager.generate_openpgp_key()