summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2009-01-15 15:36:10 (GMT)
committerMark Dickinson <dickinsm@gmail.com>2009-01-15 15:36:10 (GMT)
commit29500f64b609e312e72150f0539c4508d650656b (patch)
tree1c484a230dd9b36dd5a86ea7c9fb8a4fa5b4fa10 /Lib
parentb8baf6360f7e93f5caa2a20292a868f890056215 (diff)
downloadcpython-29500f64b609e312e72150f0539c4508d650656b.zip
cpython-29500f64b609e312e72150f0539c4508d650656b.tar.gz
cpython-29500f64b609e312e72150f0539c4508d650656b.tar.bz2
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. ........
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_socket.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index b0fe057..731827c 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)