merge 3.4

This commit is contained in:
Benjamin Peterson 2014-04-16 16:17:16 -04:00
commit 3ae4f992d7

View file

@ -1335,7 +1335,6 @@ class ChildWatcherTestsMixin:
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)