[Python-checkins] r68611 - in python/trunk: Lib/test/test_socket.py Misc/NEWS

[mark.dickinson]

Author: mark.dickinson
Date: Thu Jan 15 15:54:37 2009
New Revision: 68611

Log:
Issue #4397.  Fix occasional test_socket failure on OS X.


Modified:
   python/trunk/Lib/test/test_socket.py
   python/trunk/Misc/NEWS

Modified: python/trunk/Lib/test/test_socket.py
==============================================================================
--- python/trunk/Lib/test/test_socket.py	(original)
+++ python/trunk/Lib/test/test_socket.py	Thu Jan 15 15:54:37 2009
@@ -584,6 +584,10 @@
         # 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 #4937.)
+        self.done.wait()
 
     def _testShutdown(self):
         self.serv_conn.send(MSG)

Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Thu Jan 15 15:54:37 2009
@@ -357,6 +357,8 @@
 Extension Modules
 -----------------
 
+- Issue #4937: Fix occasional test_socket failure on OS X.
+
 - Issue #4279: Fix build of parsermodule under Cygwin.
 
 - Issue #4051: Prevent conflict of UNICODE macros in cPickle.