From 0ffef20a20522cf060c8c75f84ad6ab9a77470d2 Mon Sep 17 00:00:00 2001
From: Jakub Warmuz <jakub@warmuz.org>
Date: Tue, 29 Sep 2015 07:02:33 +0000
Subject: [PATCH] UnrecognizedChallenge: fix tests and lint.

---
 acme/acme/challenges.py      |  2 ++
 acme/acme/challenges_test.py | 26 ++++++++++++++++++++++++++
 acme/acme/messages_test.py   | 18 ------------------
 3 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/acme/acme/challenges.py b/acme/acme/challenges.py
index 4731c043f..d81e77f83 100644
--- a/acme/acme/challenges.py
+++ b/acme/acme/challenges.py
@@ -64,9 +64,11 @@ class UnrecognizedChallenge(Challenge):
     """
 
     def __init__(self, jobj):
+        super(UnrecognizedChallenge, self).__init__()
         object.__setattr__(self, "jobj", jobj)
 
     def to_partial_json(self):
+        # pylint: disable=no-member
         return self.jobj
 
     @classmethod
diff --git a/acme/acme/challenges_test.py b/acme/acme/challenges_test.py
index c82d95e19..ed44d4c45 100644
--- a/acme/acme/challenges_test.py
+++ b/acme/acme/challenges_test.py
@@ -17,6 +17,32 @@ CERT = test_util.load_cert('cert.pem')
 KEY = test_util.load_rsa_private_key('rsa512_key.pem')
 
 
+class ChallengeTest(unittest.TestCase):
+
+    def test_from_json_unrecognized(self):
+        from acme.challenges import Challenge
+        from acme.challenges import UnrecognizedChallenge
+        chall = UnrecognizedChallenge({"type": "foo"})
+        # pylint: disable=no-member
+        self.assertEqual(chall, Challenge.from_json(chall.jobj))
+
+
+class UnrecognizedChallengeTest(unittest.TestCase):
+
+    def setUp(self):
+        from acme.challenges import UnrecognizedChallenge
+        self.jobj = {"type": "foo"}
+        self.chall = UnrecognizedChallenge(self.jobj)
+
+    def test_to_partial_json(self):
+        self.assertEqual(self.jobj, self.chall.to_partial_json())
+
+    def test_from_json(self):
+        from acme.challenges import UnrecognizedChallenge
+        self.assertEqual(
+            self.chall, UnrecognizedChallenge.from_json(self.jobj))
+
+
 class SimpleHTTPTest(unittest.TestCase):
 
     def setUp(self):
diff --git a/acme/acme/messages_test.py b/acme/acme/messages_test.py
index d7bbdb0e4..d2d859bc5 100644
--- a/acme/acme/messages_test.py
+++ b/acme/acme/messages_test.py
@@ -301,19 +301,6 @@ class AuthorizationTest(unittest.TestCase):
             'combinations': combinations,
         }
 
-        # For unknown challenge types
-        self.jmsg_unknown_chall = {
-            'resource': 'challenge',
-            'uri': 'random_uri',
-            'type': 'unknown',
-            'tls': True,
-        }
-
-        self.jobj_from_unknown = {
-            'identifier': identifier.to_json(),
-            'challenges': [self.jmsg_unknown_chall],
-        }
-
     def test_from_json(self):
         from acme.messages import Authorization
         Authorization.from_json(self.jobj_from)
@@ -328,11 +315,6 @@ class AuthorizationTest(unittest.TestCase):
             (self.challbs[1], self.challbs[2]),
         ))
 
-    def test_unknown_chall_type(self):
-        """Just make sure an error isn't thrown."""
-        from acme.messages import Authorization
-        Authorization.from_json(self.jobj_from_unknown)
-
 
 class AuthorizationResourceTest(unittest.TestCase):
     """Tests for acme.messages.AuthorizationResource."""