From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Thu, 3 Jun 2021 04:38:31 +0000 (-0700)
Subject: bpo-44022: Improve the regression test. (GH-26503) (GH-26508)
X-Git-Tag: v3.6.14~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b6f4e5e13ebd1f957b47f7415b53d0869bdbac6;p=thirdparty%2FPython%2Fcpython.git

bpo-44022: Improve the regression test. (GH-26503) (GH-26508)

It wasn't actually detecting the regression due to the
assertion being too lenient.
(cherry picked from commit e60ab843cbb016fb6ff8b4f418641ac05a9b2fcc)

Co-authored-by: Gregory P. Smith <greg@krypto.org>
---

diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py
index 0db287507c7b..0b42923ce663 100644
--- a/Lib/test/test_httplib.py
+++ b/Lib/test/test_httplib.py
@@ -977,7 +977,12 @@ class BasicTest(TestCase):
             'r\n' * 32768
         )
         resp = client.HTTPResponse(FakeSocket(body))
-        self.assertRaises(client.HTTPException, resp.begin)
+        with self.assertRaises(client.HTTPException) as cm:
+            resp.begin()
+        # We must assert more because other reasonable errors that we
+        # do not want can also be HTTPException derived.
+        self.assertIn('got more than ', str(cm.exception))
+        self.assertIn('headers', str(cm.exception))
 
     def test_overflowing_chunked_line(self):
         body = (