summaryrefslogtreecommitdiff
path: root/Lib/test/test_httpservers.py
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2014-06-24 16:49:04 -0400
committerR David Murray <rdmurray@bitdance.com>2014-06-24 16:49:04 -0400
commit24a3c72638c1bbaa2d1351553b73627dab5df5ee (patch)
tree70d5a02259f793327d5ac096554c4b73f4d40d36 /Lib/test/test_httpservers.py
parent777aa64eaad2e64b847a0c167e9a633889a37347 (diff)
parent14199f939278d67804cf44ef0b9d32f998c62d58 (diff)
downloadcpython-git-24a3c72638c1bbaa2d1351553b73627dab5df5ee.tar.gz
merge: #20155: use fake HTTP method names so windows doesn't hang the tests.
Diffstat (limited to 'Lib/test/test_httpservers.py')
-rw-r--r--Lib/test/test_httpservers.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py
index 493fade985..15dec1c8d0 100644
--- a/Lib/test/test_httpservers.py
+++ b/Lib/test/test_httpservers.py
@@ -125,7 +125,7 @@ class BaseHTTPServerTestCase(BaseTestCase):
def test_request_line_trimming(self):
self.con._http_vsn_str = 'HTTP/1.1\n'
- self.con.putrequest('GET', '/')
+ self.con.putrequest('XYZBOGUS', '/')
self.con.endheaders()
res = self.con.getresponse()
self.assertEqual(res.status, 501)
@@ -152,8 +152,9 @@ class BaseHTTPServerTestCase(BaseTestCase):
self.assertEqual(res.status, 501)
def test_version_none(self):
+ # Test that a valid method is rejected when not HTTP/1.x
self.con._http_vsn_str = ''
- self.con.putrequest('PUT', '/')
+ self.con.putrequest('CUSTOM', '/')
self.con.endheaders()
res = self.con.getresponse()
self.assertEqual(res.status, 400)