summaryrefslogtreecommitdiff
path: root/service/test
diff options
context:
space:
mode:
authorFolker Bernitt <fbernitt@thoughtworks.com>2014-08-08 18:01:48 +0200
committerFolker Bernitt <fbernitt@thoughtworks.com>2014-08-08 18:03:58 +0200
commit77b12bda3df10710daf7c441512146170523f003 (patch)
treee8332c492d79e8b7482e5a5b560f14213cc8933a /service/test
parentd3a31756c17165d4685287868f53265e49762377 (diff)
Updated some leap components to latest version.
- Send public key to leap now works - Fetching mail works with a recent leap provider version - Added register to LeapAuthenticator to create a new account
Diffstat (limited to 'service/test')
-rw-r--r--service/test/bitmask_libraries/nicknym_test.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/service/test/bitmask_libraries/nicknym_test.py b/service/test/bitmask_libraries/nicknym_test.py
index 46c70371..17a87883 100644
--- a/service/test/bitmask_libraries/nicknym_test.py
+++ b/service/test/bitmask_libraries/nicknym_test.py
@@ -15,7 +15,7 @@ class NickNymTest(AbstractLeapTest):
#then
init_mock.assert_called_with('test_user@some-server.test', 'https://nicknym.some-server.test:6425/',
- self.soledad, self.session_id, '/some/path/to/ca_cert',
+ self.soledad, self.token, '/some/path/to/ca_cert',
'https://api.some-server.test:4430', '1', self.uuid,
'/path/to/gpg')
@@ -27,7 +27,7 @@ class NickNymTest(AbstractLeapTest):
nicknym = NickNym(self.provider, self.config, self.soledad_session, self.srp_session)
#when/then
- self.assertRaises(NotImplementedError, nicknym.generate_openpgp_key)
+ nicknym.generate_openpgp_key()
keyman.get_key.assert_called_with('test_user@some-server.test', openpgp.OpenPGPKey, fetch_remote=False, private=True)
keyman.gen_key.assert_called_with(openpgp.OpenPGPKey)