diff options
author | Ruben Pollan <meskio@sindominio.net> | 2014-07-25 19:28:15 -0500 |
---|---|---|
committer | Ruben Pollan <meskio@sindominio.net> | 2014-07-25 19:28:15 -0500 |
commit | 008328cc0ad2738109472869f3644100ca85859d (patch) | |
tree | e992505057a42ab63ab44681591225c499be6539 /keymanager | |
parent | 93bd48dd8855e4b4c7ebccb0148fd09c4a347f65 (diff) |
Fix test_send_key
Diffstat (limited to 'keymanager')
-rw-r--r-- | keymanager/src/leap/keymanager/tests/test_keymanager.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/keymanager/src/leap/keymanager/tests/test_keymanager.py b/keymanager/src/leap/keymanager/tests/test_keymanager.py index e2558e4..f89dcd9 100644 --- a/keymanager/src/leap/keymanager/tests/test_keymanager.py +++ b/keymanager/src/leap/keymanager/tests/test_keymanager.py @@ -147,8 +147,8 @@ class KeyManagerWithSoledadTestCase(BaseLeapTest): for key in km.get_all_keys_in_local_db(private=True): km._wrapper_map[key.__class__].delete_key(key) - def _key_manager(self, user=ADDRESS, url=''): - return KeyManager(user, url, self._soledad, + def _key_manager(self, user=ADDRESS, url='', token=None): + return KeyManager(user, url, self._soledad, token=token, gpgbinary=GPG_BINARY_PATH) @@ -387,7 +387,8 @@ class KeyManagerKeyManagementTestCase(KeyManagerWithSoledadTestCase): """ Test that request is well formed when sending keys to server. """ - km = self._key_manager() + token = "mytoken" + km = self._key_manager(token=token) km._wrapper_map[OpenPGPKey].put_ascii_key(PUBLIC_KEY) km._fetcher.put = Mock() # the following data will be used on the send @@ -404,7 +405,7 @@ class KeyManagerKeyManagementTestCase(KeyManagerWithSoledadTestCase): url = '%s/%s/users/%s.json' % ('apiuri', 'apiver', 'myuid') km._fetcher.put.assert_called_once_with( url, data=data, verify='capath', - cookies={'_session_id': 'sessionid'}, + headers={'Authorization': 'Token token=%s' % token}, ) def test__fetch_keys_from_server(self): |