summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-04-16 20:17:16 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-04-16 20:17:16 (GMT)
commit3ae4f992d7af38e5c667eb57a1882eaf04c3c2d9 (patch)
tree301e88811786bf178e07ba95c88bf74466da9b7e /Lib/test
parentb581ae9030eb8756772daa65d7ef7034776a7977 (diff)
parentfa873f66c6b645355246f5028e9124c179a83c94 (diff)
downloadcpython-3ae4f992d7af38e5c667eb57a1882eaf04c3c2d9.zip
cpython-3ae4f992d7af38e5c667eb57a1882eaf04c3c2d9.tar.gz
cpython-3ae4f992d7af38e5c667eb57a1882eaf04c3c2d9.tar.bz2
merge 3.4
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_asyncio/test_unix_events.py1
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
index cc74383..744c319 100644
--- a/Lib/test/test_asyncio/test_unix_events.py
+++ b/Lib/test/test_asyncio/test_unix_events.py
@@ -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)