[Python-checkins] cpython (merge 3.4 -> default): merge 3.4

[benjamin.peterson]

http://hg.python.org/cpython/rev/53ba8ec5ece6
changeset:   90368:53ba8ec5ece6
parent:      90366:578671ede1be
parent:      90367:30a7e37b8441
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Apr 16 16:17:16 2014 -0400
summary:
  merge 3.4

files:
  Lib/test/test_asyncio/test_unix_events.py |  1 -
  1 files changed, 0 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_asyncio/test_unix_events.py b/Lib/test/test_asyncio/test_unix_events.py
--- a/Lib/test/test_asyncio/test_unix_events.py
+++ b/Lib/test/test_asyncio/test_unix_events.py
@@ -1335,7 +1335,6 @@
         with self.ignore_warnings:
             self.watcher._sig_chld()
 
-        callback.assert_called(m.waitpid)
         if isinstance(self.watcher, asyncio.FastChildWatcher):
             # here the FastChildWatche enters a deadlock
             # (there is no way to prevent it)

-- 
Repository URL: http://hg.python.org/cpython