diff options
| author | Mark Dickinson <dickinsm@gmail.com> | 2009-01-15 15:25:51 (GMT) |
|---|---|---|
| committer | Mark Dickinson <dickinsm@gmail.com> | 2009-01-15 15:25:51 (GMT) |
| commit | 17d83f3d0d88c0982698dea21075ff8df4631ff2 (patch) | |
| tree | fb9fbfb6fce24843ae9927b44f305dd2db8b21ef | |
| parent | 6784ffb22f71c6deb20d0911e7216e119d983f33 (diff) | |
| download | cpython-17d83f3d0d88c0982698dea21075ff8df4631ff2.zip cpython-17d83f3d0d88c0982698dea21075ff8df4631ff2.tar.gz cpython-17d83f3d0d88c0982698dea21075ff8df4631ff2.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.
........
| -rw-r--r-- | Lib/test/test_socket.py | 4 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index 1287dd1..2980889 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -584,6 +584,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) @@ -314,6 +314,8 @@ C-API Extension Modules ----------------- +- Issue #4397: 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. |