[Python-checkins] r68616 - in python/branches/release30-maint: Lib/test/test_socket.py Misc/NEWS

[mark.dickinson]

Author: mark.dickinson
Date: Thu Jan 15 16:37:41 2009
New Revision: 68616

Log:
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.
  ........
................


Modified:
   python/branches/release30-maint/   (props changed)
   python/branches/release30-maint/Lib/test/test_socket.py
   python/branches/release30-maint/Misc/NEWS

Modified: python/branches/release30-maint/Lib/test/test_socket.py
==============================================================================
--- python/branches/release30-maint/Lib/test/test_socket.py	(original)
+++ python/branches/release30-maint/Lib/test/test_socket.py	Thu Jan 15 16:37:41 2009
@@ -603,6 +603,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 #4397.)
+        self.done.wait()
 
     def _testShutdown(self):
         self.serv_conn.send(MSG)

Modified: python/branches/release30-maint/Misc/NEWS
==============================================================================
--- python/branches/release30-maint/Misc/NEWS	(original)
+++ python/branches/release30-maint/Misc/NEWS	Thu Jan 15 16:37:41 2009
@@ -225,6 +225,8 @@
 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.