mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

gh-71339: Use new assertion methods in the http tests (GH-129058)

Browse source
This commit is contained in:
Serhiy Storchaka 2025-04-14 09:24:54 +03:00 • committed by GitHub
parent f98b9b4cbb
commit 7076d076c2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 19 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Lib/test/test_httpservers.py
View file

@ -447,8 +447,7 @@ class RequestHandlerLoggingTestCase(BaseTestCase):
self.con.request('GET', '/')
self.con.getresponse()
self.assertTrue(
err.getvalue().endswith('"GET / HTTP/1.1" 200 -\n'))
self.assertEndsWith(err.getvalue(), '"GET / HTTP/1.1" 200 -\n')
def test_err(self):
self.con = http.client.HTTPConnection(self.HOST, self.PORT)
@ -459,8 +458,8 @@ class RequestHandlerLoggingTestCase(BaseTestCase):
self.con.getresponse()
lines = err.getvalue().split('\n')
self.assertTrue(lines[0].endswith('code 404, message File not found'))
self.assertTrue(lines[1].endswith('"ERROR / HTTP/1.1" 404 -'))
self.assertEndsWith(lines[0], 'code 404, message File not found')
self.assertEndsWith(lines[1], '"ERROR / HTTP/1.1" 404 -')
class SimpleHTTPServerTestCase(BaseTestCase):
@ -584,7 +583,7 @@ class SimpleHTTPServerTestCase(BaseTestCase):
response = self.request(attack_url)
self.check_status_and_reason(response, HTTPStatus.MOVED_PERMANENTLY)
location = response.getheader('Location')
self.assertFalse(location.startswith('//'), msg=location)
self.assertNotStartsWith(location, '//')
self.assertEqual(location, expected_location,
msg='Expected Location header to start with a single / and '
'end with a / as this is a directory redirect.')
@ -607,7 +606,7 @@ class SimpleHTTPServerTestCase(BaseTestCase):
# We're just ensuring that the scheme and domain make it through, if
# there are or aren't multiple slashes at the start of the path that
# follows that isn't important in this Location: header.
self.assertTrue(location.startswith('https://pypi.org/'), msg=location)
self.assertStartsWith(location, 'https://pypi.org/')
def test_get(self):
#constructs the path relative to the root directory of the HTTPServer
@ -1206,7 +1205,7 @@ class BaseHTTPRequestHandlerTestCase(unittest.TestCase):
b'Host: dummy\r\n'
b'\r\n'
)
self.assertTrue(result[0].startswith(b'HTTP/1.1 400 '))
self.assertStartsWith(result[0], b'HTTP/1.1 400 ')
self.verify_expected_headers(result[1:result.index(b'\r\n')])
self.assertFalse(self.handler.get_called)