http://hg.python.org/cpython/rev/e67ad57eed26 changeset: 91363:e67ad57eed26 parent: 91360:e1d81c32f13d parent: 91362:ffdd2d0b0049 user: R David Murray <rdmurray@bitdance.com> date: Tue Jun 24 16:49:04 2014 -0400 summary: merge: #20155: use fake HTTP method names so windows doesn't hang the tests. files: Lib/test/test_httpservers.py | 5 +++-- Misc/ACKS | 1 + Misc/NEWS | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py --- a/Lib/test/test_httpservers.py +++ b/Lib/test/test_httpservers.py @@ -125,7 +125,7 @@ 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 @@ 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) diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -29,6 +29,7 @@ Jyrki Alakuijala Steve Alexander Fred Allen +Jeff Allen Ray Allen Billy G. Allie Kevin Altis diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -612,6 +612,10 @@ Tests ----- +- Issue #20155: Changed HTTP method names in failing tests in test_httpservers + so that packet filtering software (specifically Windows Base Filtering Engine) + does not interfere with the transaction semantics expected by the tests. + - Issue #19493: Refactored the ctypes test package to skip tests explicitly rather than silently. -- Repository URL: http://hg.python.org/cpython