changeset:   91362:ffdd2d0b0049
branch:      3.4
parent:      91359:978525270264
user:        R David Murray <rdmurray@bitdance.com>
date:        Tue Jun 24 16:39:49 2014 -0400
files:       Lib/test/test_httpservers.py Misc/ACKS Misc/NEWS
description:
#20155: use fake HTTP method names so windows doesn't hang the tests.

Windows was seeing the 'GET' generated by these tests as invalid and forcibly
closing the socket, causing the test to fail.

Patch by Jeff Allen.


diff -r 978525270264 -r ffdd2d0b0049 Lib/test/test_httpservers.py
--- a/Lib/test/test_httpservers.py	Tue Jun 24 22:37:53 2014 +0200
+++ b/Lib/test/test_httpservers.py	Tue Jun 24 16:39:49 2014 -0400
@@ -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 -r 978525270264 -r ffdd2d0b0049 Misc/ACKS
--- a/Misc/ACKS	Tue Jun 24 22:37:53 2014 +0200
+++ b/Misc/ACKS	Tue Jun 24 16:39:49 2014 -0400
@@ -29,6 +29,7 @@
 Jyrki Alakuijala
 Steve Alexander
 Fred Allen
+Jeff Allen
 Ray Allen
 Billy G. Allie
 Kevin Altis
diff -r 978525270264 -r ffdd2d0b0049 Misc/NEWS
--- a/Misc/NEWS	Tue Jun 24 22:37:53 2014 +0200
+++ b/Misc/NEWS	Tue Jun 24 16:39:49 2014 -0400
@@ -133,6 +133,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.