From 0216ea3f2684ab3622f7954845230a008f2c356d Mon Sep 17 00:00:00 2001 From: Jakub Warmuz Date: Sun, 3 May 2015 19:44:53 +0000 Subject: [PATCH] boulder#130 fixed --- letsencrypt/client/network2.py | 6 +----- letsencrypt/client/tests/network2_test.py | 7 ++----- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/letsencrypt/client/network2.py b/letsencrypt/client/network2.py index 16ab80f3b..eaa485a8d 100644 --- a/letsencrypt/client/network2.py +++ b/letsencrypt/client/network2.py @@ -315,11 +315,7 @@ class Network(object): try: authzr_uri = response.links['up']['url'] except KeyError: - # TODO: Right now Boulder responds with the authorization resource - # instead of a challenge resource... this can be uncommented - # once the error is fixed (boulder#130). - return None - # raise errors.NetworkError('"up" Link header missing') + raise errors.NetworkError('"up" Link header missing') challr = messages2.ChallengeResource( authzr_uri=authzr_uri, body=messages2.ChallengeBody.from_json(response.json())) diff --git a/letsencrypt/client/tests/network2_test.py b/letsencrypt/client/tests/network2_test.py index 195788d66..d14d27f6a 100644 --- a/letsencrypt/client/tests/network2_test.py +++ b/letsencrypt/client/tests/network2_test.py @@ -286,11 +286,8 @@ class NetworkTest(unittest.TestCase): def test_answer_challenge_missing_next(self): self._mock_post_get() - self.assertTrue(self.net.answer_challenge( - self.challr.body, challenges.DNSResponse()) is None) - # TODO: boulder#130, acme-spec#110 - # self.assertRaises(errors.NetworkError, self.net.answer_challenge, - # self.challr.body, challenges.DNSResponse()) + self.assertRaises(errors.NetworkError, self.net.answer_challenge, + self.challr.body, challenges.DNSResponse()) def test_retry_after_date(self): self.response.headers['Retry-After'] = 'Fri, 31 Dec 1999 23:59:59 GMT'