From 29500f64b609e312e72150f0539c4508d650656b Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Thu, 15 Jan 2009 15:36:10 +0000 Subject: [PATCH] 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. ........ --- Lib/test/test_socket.py | 4 ++++ Misc/NEWS | 2 ++ 2 files changed, 6 insertions(+) diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index b0fe0577717..731827c84b9 100644 --- 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 e5369a3e404..7588f4689ab 100644 --- 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