Fixed unit tests and lint

letsencrypt/plugins/common_test.py

@@ -1,16 +1,15 @@
 """Tests for letsencrypt.plugins.common."""
-import os
-import pkg_resources
 import unittest
 
 import mock
 
 from acme import challenges
+from acme import jose
 
 from letsencrypt import achallenges
-from letsencrypt import le_util
 
 from letsencrypt.tests import acme_util
+from letsencrypt.tests import test_util
 
 
 class NamespaceFunctionsTest(unittest.TestCase):
@@ -111,12 +110,7 @@ class AddrTest(unittest.TestCase):
 class DvsniTest(unittest.TestCase):
     """Tests for letsencrypt.plugins.common.DvsniTest."""
 
-    rsa256_file = pkg_resources.resource_filename(
-        "letsencrypt.tests", os.path.join("testdata", "rsa256_key.pem"))
-    rsa256_pem = pkg_resources.resource_string(
-        "letsencrypt.tests", os.path.join("testdata", "rsa256_key.pem"))
-
-    auth_key = le_util.Key(rsa256_file, rsa256_pem)
+    auth_key = jose.JWKRSA.load(test_util.load_vector("rsa512_key.pem"))
     achalls = [
         achallenges.DVSNI(
             challb=acme_util.chall_to_challb(

letsencrypt/plugins/manual.py

@@ -13,7 +13,6 @@ import zope.component
 import zope.interface
 
 from acme import challenges
-from acme import jose
 
 from letsencrypt import errors
 from letsencrypt import interfaces
@@ -158,8 +157,8 @@ binary for temporary key/certificate generation.""".replace("\n", "")
         else:
             self._notify_and_wait(self.MESSAGE_TEMPLATE.format(
                 achall=achall, response=response,
-                uri=response.uri(achall.domain), ct=response.CONTENT_TYPE,
-                command=command))
+                uri=response.uri(achall.domain, achall.challb.chall),
+                ct=response.CONTENT_TYPE, command=command))
 
         if response.simple_verify(
                 achall.chall, achall.domain,

letsencrypt/plugins/manual_test.py

@@ -5,11 +5,16 @@ import unittest
 import mock
 
 from acme import challenges
+from acme import jose
 
 from letsencrypt import achallenges
 from letsencrypt import errors
 
 from letsencrypt.tests import acme_util
+from letsencrypt.tests import test_util
+
+
+KEY = jose.JWKRSA.load(test_util.load_vector("rsa512_key.pem"))
 
 
 class ManualAuthenticatorTest(unittest.TestCase):
@@ -21,8 +26,9 @@ class ManualAuthenticatorTest(unittest.TestCase):
             no_simple_http_tls=True, simple_http_port=4430,
             manual_test_mode=False)
         self.auth = ManualAuthenticator(config=self.config, name="manual")
+        account = mock.MagicMock(key=KEY)
         self.achalls = [achallenges.SimpleHTTP(
-            challb=acme_util.SIMPLE_HTTP, domain="foo.com", key=None)]
+            challb=acme_util.SIMPLE_HTTP_P, domain="foo.com", account=account)]
 
         config_test_mode = mock.MagicMock(
             no_simple_http_tls=True, simple_http_port=4430,
@@ -49,14 +55,14 @@ class ManualAuthenticatorTest(unittest.TestCase):
         mock_urandom.return_value = "foo"
         mock_verify.return_value = True
 
-        resp = challenges.SimpleHTTPResponse(tls=False, path='Zm9v')
+        resp = challenges.SimpleHTTPResponse(tls=False)
         self.assertEqual([resp], self.auth.perform(self.achalls))
         self.assertEqual(1, mock_raw_input.call_count)
-        mock_verify.assert_called_with(self.achalls[0].challb, "foo.com", 4430)
+        mock_verify.assert_called_with(
+            self.achalls[0].challb.chall, "foo.com", KEY.public_key(), 4430)
 
         message = mock_stdout.write.mock_calls[0][1][0]
         self.assertTrue(self.achalls[0].token in message)
-        self.assertTrue('Zm9v' in message)
 
         mock_verify.return_value = False
         self.assertEqual([None], self.auth.perform(self.achalls))