From f98b9b4cbb7905c9af45718505389d171ca3c590 Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Mon, 14 Apr 2025 09:24:41 +0300 Subject: gh-71339: Use new assertion methods in the urllib tests (GH-129056) --- Lib/test/test_urllib.py | 8 ++------ Lib/test/test_urllib2.py | 12 ++++++------ Lib/test/test_urllib2_localnet.py | 3 +-- Lib/test/test_urllibnet.py | 3 +-- Lib/test/test_urlparse.py | 7 +++---- 5 files changed, 13 insertions(+), 20 deletions(-) diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py index abfbed8..da3db2f 100644 --- a/Lib/test/test_urllib.py +++ b/Lib/test/test_urllib.py @@ -121,9 +121,7 @@ class urlopen_FileTests(unittest.TestCase): # Make sure object returned by urlopen() has the specified methods for attr in ("read", "readline", "readlines", "fileno", "close", "info", "geturl", "getcode", "__iter__"): - self.assertTrue(hasattr(self.returned_obj, attr), - "object returned by urlopen() lacks %s attribute" % - attr) + self.assertHasAttr(self.returned_obj, attr) def test_read(self): self.assertEqual(self.text, self.returned_obj.read()) @@ -544,9 +542,7 @@ class urlopen_DataTests(unittest.TestCase): # Make sure object returned by urlopen() has the specified methods for attr in ("read", "readline", "readlines", "close", "info", "geturl", "getcode", "__iter__"): - self.assertTrue(hasattr(self.text_url_resp, attr), - "object returned by urlopen() lacks %s attribute" % - attr) + self.assertHasAttr(self.text_url_resp, attr) def test_info(self): self.assertIsInstance(self.text_url_resp.info(), email.message.Message) diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py index f44d324..b122960 100644 --- a/Lib/test/test_urllib2.py +++ b/Lib/test/test_urllib2.py @@ -1193,15 +1193,15 @@ class HandlerTests(unittest.TestCase): r = MockResponse(200, "OK", {}, "", url) newr = h.http_response(req, r) self.assertIs(r, newr) - self.assertFalse(hasattr(o, "proto")) # o.error not called + self.assertNotHasAttr(o, "proto") # o.error not called r = MockResponse(202, "Accepted", {}, "", url) newr = h.http_response(req, r) self.assertIs(r, newr) - self.assertFalse(hasattr(o, "proto")) # o.error not called + self.assertNotHasAttr(o, "proto") # o.error not called r = MockResponse(206, "Partial content", {}, "", url) newr = h.http_response(req, r) self.assertIs(r, newr) - self.assertFalse(hasattr(o, "proto")) # o.error not called + self.assertNotHasAttr(o, "proto") # o.error not called # anything else calls o.error (and MockOpener returns None, here) r = MockResponse(502, "Bad gateway", {}, "", url) self.assertIsNone(h.http_response(req, r)) @@ -1416,7 +1416,7 @@ class HandlerTests(unittest.TestCase): response = opener.open('http://example.com/') expected = b'GET ' + result + b' ' request = handler.last_buf - self.assertTrue(request.startswith(expected), repr(request)) + self.assertStartsWith(request, expected) def test_redirect_head_request(self): from_url = "http://example.com/a.html" @@ -1906,9 +1906,9 @@ class MiscTests(unittest.TestCase): url = code = fp = None hdrs = 'Content-Length: 42' err = urllib.error.HTTPError(url, code, msg, hdrs, fp) - self.assertTrue(hasattr(err, 'reason')) + self.assertHasAttr(err, 'reason') self.assertEqual(err.reason, 'something bad happened') - self.assertTrue(hasattr(err, 'headers')) + self.assertHasAttr(err, 'headers') self.assertEqual(err.headers, 'Content-Length: 42') expected_errmsg = 'HTTP Error %s: %s' % (err.code, err.msg) self.assertEqual(str(err), expected_errmsg) diff --git a/Lib/test/test_urllib2_localnet.py b/Lib/test/test_urllib2_localnet.py index 9cb15d6..9186436 100644 --- a/Lib/test/test_urllib2_localnet.py +++ b/Lib/test/test_urllib2_localnet.py @@ -606,8 +606,7 @@ class TestUrlopen(unittest.TestCase): handler = self.start_server() with urllib.request.urlopen("http://localhost:%s" % handler.port) as open_url: for attr in ("read", "close", "info", "geturl"): - self.assertTrue(hasattr(open_url, attr), "object returned from " - "urlopen lacks the %s attribute" % attr) + self.assertHasAttr(open_url, attr) self.assertTrue(open_url.read(), "calling 'read' failed") def test_info(self): diff --git a/Lib/test/test_urllibnet.py b/Lib/test/test_urllibnet.py index ce4e60e..1a42c35 100644 --- a/Lib/test/test_urllibnet.py +++ b/Lib/test/test_urllibnet.py @@ -71,8 +71,7 @@ class urlopenNetworkTests(unittest.TestCase): with self.urlopen(self.url) as open_url: for attr in ("read", "readline", "readlines", "fileno", "close", "info", "geturl"): - self.assertTrue(hasattr(open_url, attr), "object returned from " - "urlopen lacks the %s attribute" % attr) + self.assertHasAttr(open_url, attr) self.assertTrue(open_url.read(), "calling 'read' failed") def test_readlines(self): diff --git a/Lib/test/test_urlparse.py b/Lib/test/test_urlparse.py index b51cc00..aabc360 100644 --- a/Lib/test/test_urlparse.py +++ b/Lib/test/test_urlparse.py @@ -1164,14 +1164,13 @@ class UrlParseTestCase(unittest.TestCase): with self.subTest(url=url, function=func): result = func(url, allow_fragments=False) self.assertEqual(result.fragment, "") - self.assertTrue( - getattr(result, attr).endswith("#" + expected_frag)) + self.assertEndsWith(getattr(result, attr), + "#" + expected_frag) self.assertEqual(func(url, "", False).fragment, "") result = func(url, allow_fragments=True) self.assertEqual(result.fragment, expected_frag) - self.assertFalse( - getattr(result, attr).endswith(expected_frag)) + self.assertNotEndsWith(getattr(result, attr), expected_frag) self.assertEqual(func(url, "", True).fragment, expected_frag) self.assertEqual(func(url).fragment, expected_frag) -- cgit v0.12