Merged revisions 68611-68613 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68611 | mark.dickinson | 2009-01-15 14:54:37 +0000 (Thu, 15 Jan 2009) | 2 lines

  Issue #4397.  Fix occasional test_socket failure on OS X.
........
  r68612 | mark.dickinson | 2009-01-15 14:58:28 +0000 (Thu, 15 Jan 2009) | 2 lines

  Comment typo
........
  r68613 | mark.dickinson | 2009-01-15 15:17:43 +0000 (Thu, 15 Jan 2009) | 2 lines

  Another typo fix.
........

diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index b0fe0577717e8c274250f3e86adfd9303fb72a8c..731827c84b9710f777df90435e45261f4d95a613 100644 (file)
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -603,6 +603,10 @@ class BasicTCPTest(SocketConnectedTest):
         # Testing shutdown()
         msg = self.cli_conn.recv(1024)
         self.assertEqual(msg, MSG)
+        # wait for _testShutdown to finish: on OS X, when the server
+        # closes the connection the client also becomes disconnected,
+        # and the client's shutdown call will fail. (Issue #4397.)
+        self.done.wait()
 
     def _testShutdown(self):
         self.serv_conn.send(MSG)

diff --git a/Misc/NEWS b/Misc/NEWS
index e5369a3e404209542168c9cc5d9212dbaaba58d8..7588f4689ab958a8cb612cf927bbcb9f93da4479 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -308,6 +308,8 @@ C-API
 Extension Modules
 -----------------
 
+- Issue #4397: Fix occasional test_socket failure on OS X.
+
 - Issue #4279: Fix build of parsermodule under Cygwin.
 
 - Issue #4751: hashlib now releases the GIL when hashing large buffers