diff --git a/Lib/test/test_http_cookiejar.py b/Lib/test/test_http_cookiejar.py
index dbf9ce10f76f91..6a3fe41adb74a2 100644
--- a/Lib/test/test_http_cookiejar.py
+++ b/Lib/test/test_http_cookiejar.py
@@ -1515,7 +1515,7 @@ def test_netscape_example_1(self):
h = req.get_header("Cookie")
self.assertIn("PART_NUMBER=ROCKET_LAUNCHER_0001", h)
self.assertIn("CUSTOMER=WILE_E_COYOTE", h)
- self.assertTrue(h.startswith("SHIPPING=FEDEX;"))
+ self.assertStartsWith(h, "SHIPPING=FEDEX;")
def test_netscape_example_2(self):
# Second Example transaction sequence:
diff --git a/Lib/test/test_http_cookies.py b/Lib/test/test_http_cookies.py
index 7b3dc0fdaedc3b..4ee33dba5d6309 100644
--- a/Lib/test/test_http_cookies.py
+++ b/Lib/test/test_http_cookies.py
@@ -180,7 +180,7 @@ def test_special_attrs(self):
C = cookies.SimpleCookie('Customer="WILE_E_COYOTE"')
C['Customer']['expires'] = 0
# can't test exact output, it always depends on current date/time
- self.assertTrue(C.output().endswith('GMT'))
+ self.assertEndsWith(C.output(), 'GMT')
# loading 'expires'
C = cookies.SimpleCookie()
diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py
index 7a7ec555a2dbbb..90109b2b88f5d8 100644
--- a/Lib/test/test_httplib.py
+++ b/Lib/test/test_httplib.py
@@ -273,7 +273,7 @@ def test_ipv6host_header(self):
sock = FakeSocket('')
conn.sock = sock
conn.request('GET', '/foo')
- self.assertTrue(sock.data.startswith(expected))
+ self.assertStartsWith(sock.data, expected)
expected = b'GET /foo HTTP/1.1\r\nHost: [2001:102A::]\r\n' \
b'Accept-Encoding: identity\r\n\r\n'
@@ -281,7 +281,7 @@ def test_ipv6host_header(self):
sock = FakeSocket('')
conn.sock = sock
conn.request('GET', '/foo')
- self.assertTrue(sock.data.startswith(expected))
+ self.assertStartsWith(sock.data, expected)
expected = b'GET /foo HTTP/1.1\r\nHost: [fe80::]\r\n' \
b'Accept-Encoding: identity\r\n\r\n'
@@ -289,7 +289,7 @@ def test_ipv6host_header(self):
sock = FakeSocket('')
conn.sock = sock
conn.request('GET', '/foo')
- self.assertTrue(sock.data.startswith(expected))
+ self.assertStartsWith(sock.data, expected)
expected = b'GET /foo HTTP/1.1\r\nHost: [fe80::]:81\r\n' \
b'Accept-Encoding: identity\r\n\r\n'
@@ -297,7 +297,7 @@ def test_ipv6host_header(self):
sock = FakeSocket('')
conn.sock = sock
conn.request('GET', '/foo')
- self.assertTrue(sock.data.startswith(expected))
+ self.assertStartsWith(sock.data, expected)
def test_malformed_headers_coped_with(self):
# Issue 19996
@@ -335,9 +335,9 @@ def test_parse_all_octets(self):
self.assertIsNotNone(resp.getheader('obs-text'))
self.assertIn('obs-text', resp.msg)
for folded in (resp.getheader('obs-fold'), resp.msg['obs-fold']):
- self.assertTrue(folded.startswith('text'))
+ self.assertStartsWith(folded, 'text')
self.assertIn(' folded with space', folded)
- self.assertTrue(folded.endswith('folded with tab'))
+ self.assertEndsWith(folded, 'folded with tab')
def test_invalid_headers(self):
conn = client.HTTPConnection('example.com')
@@ -1000,8 +1000,7 @@ def test_send_file(self):
sock = FakeSocket(body)
conn.sock = sock
conn.request('GET', '/foo', body)
- self.assertTrue(sock.data.startswith(expected), '%r != %r' %
- (sock.data[:len(expected)], expected))
+ self.assertStartsWith(sock.data, expected)
def test_send(self):
expected = b'this is a test this is only a test'
@@ -1545,7 +1544,7 @@ def mypeek(n=-1):
# then unbounded peek
p2 = resp.peek()
self.assertGreaterEqual(len(p2), len(p))
- self.assertTrue(p2.startswith(p))
+ self.assertStartsWith(p2, p)
next = resp.read(len(p2))
self.assertEqual(next, p2)
else:
@@ -1570,7 +1569,7 @@ def _verify_readline(self, readline, expected, limit=5):
line = readline(limit)
if line and line != b"foo":
if len(line) < 5:
- self.assertTrue(line.endswith(b"\n"))
+ self.assertEndsWith(line, b"\n")
all.append(line)
if not line:
break
@@ -1765,7 +1764,7 @@ def test_client_constants(self):
]
for const in expected:
with self.subTest(constant=const):
- self.assertTrue(hasattr(client, const))
+ self.assertHasAttr(client, const)
class SourceAddressTest(TestCase):
@@ -2407,8 +2406,7 @@ def test_tunnel_connect_single_send_connection_setup(self):
msg=f'unexpected number of send calls: {mock_send.mock_calls}')
proxy_setup_data_sent = mock_send.mock_calls[0][1][0]
self.assertIn(b'CONNECT destination.com', proxy_setup_data_sent)
- self.assertTrue(
- proxy_setup_data_sent.endswith(b'\r\n\r\n'),
+ self.assertEndsWith(proxy_setup_data_sent, b'\r\n\r\n',
msg=f'unexpected proxy data sent {proxy_setup_data_sent!r}')
def test_connect_put_request(self):
diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py
index 1c370dcafa9fea..ccd60019d07764 100644
--- a/Lib/test/test_httpservers.py
+++ b/Lib/test/test_httpservers.py
@@ -335,8 +335,7 @@ def test_get(self):
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)
@@ -347,8 +346,8 @@ def test_err(self):
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):
@@ -472,7 +471,7 @@ def test_get_dir_redirect_location_domain_injection_bug(self):
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.')
@@ -495,7 +494,7 @@ def test_get_dir_redirect_location_domain_injection_bug(self):
# 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
@@ -1094,7 +1093,7 @@ def test_extra_space(self):
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)
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy