[tests] fix keymanager tests after refactor and merge

- some pep8 problems
- some confusion with old and new code after merging
from old keymanager

3 files changed, 33 insertions, 30 deletions

diff --git a/tests/integration/keymanager/test_keymanager.py b/tests/integration/keymanager/test_keymanager.py
index c623b94..86e9115 100644
--- a/tests/integration/keymanager/test_keymanager.py
+++ b/tests/integration/keymanager/test_keymanager.py
@@ -206,8 +206,8 @@ class KeyManagerKeyManagementTestCase(KeyManagerWithSoledadTestCase):
         token = "mytoken"
         km = self._key_manager(token=token)
         yield km._openpgp.put_raw_key(PUBLIC_KEY, ADDRESS)
-        km._async_client.request = mock.Mock(
-            return_value=defer.succeed(''))
+        km._nicknym._async_client_pinned.request = \
+            mock.Mock(return_value=defer.succeed(''))
         # the following data will be used on the send
         km.ca_cert_path = 'capath'
         km.session_id = 'sessionid'
@@ -280,9 +280,9 @@ class KeyManagerKeyManagementTestCase(KeyManagerWithSoledadTestCase):
             check_404_callback = used_kwargs['callback']
             fake_response = mock.Mock()
             fake_response.code = NOT_FOUND
-            with self.assertRaisesRegexp(
-                    errors.KeyNotFound,
-                    '404: Key not found. Request: %s' % url.replace('?', '\?')):
+            with self.assertRaisesRegexp(errors.KeyNotFound,
+                                         '404: Key not found. Request: '
+                                         '%s' % url.replace('?', '\?')):
                 check_404_callback(fake_response)
 
         d.addCallback(check_key_not_found_is_raised_if_404)
@@ -323,7 +323,8 @@ class KeyManagerKeyManagementTestCase(KeyManagerWithSoledadTestCase):
         """
         km = self._key_manager(url=NICKSERVER_URI)
 
-        key = yield self._fetch_key_with_address(km, ADDRESS_OTHER, PUBLIC_KEY_OTHER)
+        key = yield self._fetch_key_with_address(km, ADDRESS_OTHER,
+                                                 PUBLIC_KEY_OTHER)
         self.assertIsInstance(key, OpenPGPKey)
         self.assertTrue(ADDRESS_OTHER in key.uids)
         self.assertEqual(key.validation, ValidationLevels.Weak_Chain)
@@ -395,8 +396,8 @@ class KeyManagerKeyManagementTestCase(KeyManagerWithSoledadTestCase):
         """
         km = self._key_manager()
 
-        km._nicknym._async_client_pinned.request = mock.Mock(
-            return_value=defer.succeed(PUBLIC_KEY))
+        km._async_client.request = \
+            mock.Mock(return_value=defer.succeed(PUBLIC_KEY))
 
         yield km.fetch_key(ADDRESS, "http://site.domain/key")
         key = yield km.get_key(ADDRESS)
@@ -410,7 +411,7 @@ class KeyManagerKeyManagementTestCase(KeyManagerWithSoledadTestCase):
         """
         km = self._key_manager()
 
-        km._nicknym._async_client_pinned.request = mock.Mock(
+        km._async_client.request = mock.Mock(
             return_value=defer.succeed(self.get_public_binary_key()))
 
         yield km.fetch_key(ADDRESS, "http://site.domain/key")
@@ -423,7 +424,8 @@ class KeyManagerKeyManagementTestCase(KeyManagerWithSoledadTestCase):
         """
         km = self._key_manager()
 
-        km._nicknym._async_client_pinned.request = mock.Mock(return_value=defer.succeed(""))
+        km._nicknym._async_client_pinned.request = \
+            mock.Mock(return_value=defer.succeed(""))
         d = km.fetch_key(ADDRESS, "http://site.domain/key")
         return self.assertFailure(d, errors.KeyNotFound)
 
@@ -434,8 +436,8 @@ class KeyManagerKeyManagementTestCase(KeyManagerWithSoledadTestCase):
         """
         km = self._key_manager()
 
-        km._nicknym._async_client_pinned.request = mock.Mock(
-            return_value=defer.succeed(PUBLIC_KEY))
+        km._async_client.request = \
+            mock.Mock(return_value=defer.succeed(PUBLIC_KEY))
         d = km.fetch_key(ADDRESS_2, "http://site.domain/key")
         return self.assertFailure(d, errors.KeyAddressMismatch)
 
diff --git a/tests/integration/keymanager/test_refresher.py b/tests/integration/keymanager/test_refresher.py
index 47dd057..b5b36b0 100644
--- a/tests/integration/keymanager/test_refresher.py
+++ b/tests/integration/keymanager/test_refresher.py
@@ -18,7 +18,6 @@
 """
 Tests for refreshing the key directory.
 """
-
 from datetime import datetime
 
 from mock import Mock, patch
@@ -28,8 +27,9 @@ from twisted.logger import Logger
 
 from leap.bitmask.keymanager import openpgp
 from leap.bitmask.keymanager.keys import OpenPGPKey
-from leap.bitmask.keymanager.refresher import RandomRefreshPublicKey, MIN_RANDOM_INTERVAL_RANGE, DEBUG_START_REFRESH, \
-    DEBUG_STOP_REFRESH, ERROR_UNEQUAL_FINGERPRINTS
+from leap.bitmask.keymanager.refresher import RandomRefreshPublicKey, \
+    MIN_RANDOM_INTERVAL_RANGE, DEBUG_START_REFRESH, DEBUG_STOP_REFRESH,\
+    ERROR_UNEQUAL_FINGERPRINTS
 from leap.bitmask.keymanager.testing import KeyManagerWithSoledadTestCase
 
 from common import KEY_FINGERPRINT
@@ -37,9 +37,6 @@ from common import KEY_FINGERPRINT
 ANOTHER_FP = 'ANOTHERFINGERPRINT'
 
 
-logger = Logger()
-
-
 class RandomRefreshPublicKeyTestCase(KeyManagerWithSoledadTestCase):
 
     @defer.inlineCallbacks
@@ -53,7 +50,8 @@ class RandomRefreshPublicKeyTestCase(KeyManagerWithSoledadTestCase):
         pgp.get_all_keys = Mock(return_value=defer.succeed([key, key_another]))
 
         random_key = yield rf._get_random_key()
-        self.assertTrue(random_key.address == key.address or random_key.address == key_another.address)
+        self.assertTrue(random_key.address == key.address or
+                        random_key.address == key_another.address)
 
     @defer.inlineCallbacks
     def test_do_not_throw_error_for_empty_key_dict(self):
@@ -66,8 +64,7 @@ class RandomRefreshPublicKeyTestCase(KeyManagerWithSoledadTestCase):
         self.assertTrue(random_address is None)
 
     @defer.inlineCallbacks
-    def _test_log_error_if_fetch_by_fingerprint_returns_wrong_key(self):
-        # FIXME !!! ---------------------------------------------------
+    def test_log_error_if_fetch_by_fingerprint_returns_wrong_key(self):
         pgp = openpgp.OpenPGPScheme(
             self._soledad, gpgbinary=self.gpg_binary_path)
         km = self._key_manager()
@@ -75,10 +72,12 @@ class RandomRefreshPublicKeyTestCase(KeyManagerWithSoledadTestCase):
         with patch.object(Logger, 'error') as mock_logger_error:
             rf = RandomRefreshPublicKey(pgp, km)
             rf._get_random_key = \
-                Mock(return_value=defer.succeed(OpenPGPKey(fingerprint=KEY_FINGERPRINT)))
+                Mock(return_value=defer.succeed(OpenPGPKey(
+                    fingerprint=KEY_FINGERPRINT)))
 
             km._nicknym.fetch_key_with_fingerprint = \
-                Mock(return_value=defer.succeed(OpenPGPKey(fingerprint=ANOTHER_FP)))
+                Mock(return_value=defer.succeed(OpenPGPKey(
+                    fingerprint=ANOTHER_FP)))
 
             yield rf.maybe_refresh_key()
 
@@ -92,10 +91,11 @@ class RandomRefreshPublicKeyTestCase(KeyManagerWithSoledadTestCase):
         km = self._key_manager()
 
         rf = RandomRefreshPublicKey(pgp, km)
-        rf._get_random_key = Mock(return_value=defer.succeed(OpenPGPKey(fingerprint=KEY_FINGERPRINT)))
+        rf._get_random_key = Mock(return_value=defer.succeed(
+            OpenPGPKey(fingerprint=KEY_FINGERPRINT)))
 
-        km._nicknym.fetch_key_with_fingerprint = \
-            Mock(return_value=defer.succeed(OpenPGPKey(fingerprint=ANOTHER_FP)))
+        km._nicknym.fetch_key_with_fingerprint = Mock(
+            return_value=defer.succeed(OpenPGPKey(fingerprint=ANOTHER_FP)))
 
         yield rf.maybe_refresh_key()
 
@@ -107,13 +107,14 @@ class RandomRefreshPublicKeyTestCase(KeyManagerWithSoledadTestCase):
         rf = RandomRefreshPublicKey(pgp, km)
         key = OpenPGPKey(address='zara@leap.se', expiry_date=datetime.now())
         self.assertTrue(key.address is 'zara@leap.se')
-        km._openpgp.unactivate_key = Mock(return_value=defer.succeed(None))
+        pgp.unactivate_key = Mock(return_value=defer.succeed(None))
+
         yield rf._maybe_unactivate_key(key)
+
         self.assertTrue(key.address is None)
         self.assertFalse(key.is_active())
 
-    def _test_start_refreshing(self):
-        # FIXME !!! ---------------------------------------------------
+    def test_start_refreshing(self):
         pgp = openpgp.OpenPGPScheme(
             self._soledad, gpgbinary=self.gpg_binary_path)
 
diff --git a/tests/integration/mail/smtp/test_gateway.py b/tests/integration/mail/smtp/test_gateway.py
index e286be9..38abfe7 100644
--- a/tests/integration/mail/smtp/test_gateway.py
+++ b/tests/integration/mail/smtp/test_gateway.py
@@ -113,7 +113,7 @@ class TestSmtpGateway(KeyManagerWithSoledadTestCase):
             self._soledad, gpgbinary=self.gpg_binary_path)
         yield pgp.delete_key(pubkey)
         # mock the key fetching
-        self.km._fetch_keys_from_server = Mock(
+        self.km._nicknym.fetch_key_with_address = Mock(
             return_value=fail(errors.KeyNotFound()))
         user = TEST_USER
         proto = getSMTPFactory(