Merge branch 'master' into pyopenssl

letsencrypt/auth_handler.py

@@ -540,16 +540,11 @@ def _generate_failed_chall_msg(failed_achalls):
 
     """
     typ = failed_achalls[0].error.typ
-    msg = [
-        "The following '{0}' errors were reported by the server:".format(typ)]
+    msg = ["The following errors were reported by the server:"]
 
-    problems = dict()
     for achall in failed_achalls:
-        problems.setdefault(achall.error.description, set()).add(achall.domain)
-    for problem in problems:
-        msg.append("\n\nDomains: ")
-        msg.append(", ".join(sorted(problems[problem])))
-        msg.append("\nError: {0}".format(problem))
+        msg.append("\n\nDomain: %s\nType:   %s\nDetail: %s" % (
+            achall.domain, achall.error.typ, achall.error.detail))
 
     if typ in _ERROR_HELP:
         msg.append("\n\n")

letsencrypt/tests/auth_handler_test.py

@@ -467,7 +467,7 @@ class ReportFailedChallsTest(unittest.TestCase):
         auth_handler._report_failed_challs([self.http01, self.tls_sni_same])
         call_list = mock_zope().add_message.call_args_list
         self.assertTrue(len(call_list) == 1)
-        self.assertTrue("Domains: example.com\n" in call_list[0][0][0])
+        self.assertTrue("Domain: example.com\nType:   tls\nDetail: detail" in call_list[0][0][0])
 
     @mock.patch("letsencrypt.auth_handler.zope.component.getUtility")
     def test_different_errors_and_domains(self, mock_zope):