Merged revisions 68615 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r68615 | mark.dickinson | 2009-01-15 15:36:10 +0000 (Thu, 15 Jan 2009) | 17 lines

  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 51f41a9f2efa62904c377229f2058cf4c635b6cc..91ef6dca880550091bacf3126845b21b5fce5911 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 09d7c2fb354c0376df3a3d45893a06f7f24a3a4d..ce02ad627977779ac38c9cc0ecf76280690aa7d2 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -225,6 +225,8 @@ C-API
 Extension Modules
 -----------------
 
+- Issue #4397: Fix occasional test_socket failure on OS X.
+
 - Issue #4279: Fix build of parsermodule under Cygwin.
 
 - Issue #4228: Pack negative values the same way as 2.4 in struct's L format.