[Python-checkins] cpython (merge 3.4 -> default): (Merge 3.4) asyncio: sync with Tulip
victor.stinner
python-checkins at python.org
Wed Jun 25 23:34:50 CEST 2014
http://hg.python.org/cpython/rev/d92dc4462d26
changeset: 91415:d92dc4462d26
parent: 91413:7877aab90c61
parent: 91414:e9150fdf068a
user: Victor Stinner <victor.stinner at gmail.com>
date: Wed Jun 25 23:33:02 2014 +0200
summary:
(Merge 3.4) asyncio: sync with Tulip
- Python issue 21163: Fix more "Task was destroyed but it is pending!" logs in
tests
- Add test to check that run_until_complete() checks the loop of the future
files:
Lib/test/test_asyncio/test_base_events.py | 6 ++++++
Lib/test/test_asyncio/test_tasks.py | 3 +++
2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/Lib/test/test_asyncio/test_base_events.py b/Lib/test/test_asyncio/test_base_events.py
--- a/Lib/test/test_asyncio/test_base_events.py
+++ b/Lib/test/test_asyncio/test_base_events.py
@@ -288,6 +288,12 @@
self.assertRaises(TypeError,
self.loop.run_until_complete, 'blah')
+ def test_run_until_complete_loop(self):
+ task = asyncio.Future(loop=self.loop)
+ other_loop = self.new_test_loop()
+ self.assertRaises(ValueError,
+ other_loop.run_until_complete, task)
+
def test_subprocess_exec_invalid_args(self):
args = [sys.executable, '-c', 'pass']
diff --git a/Lib/test/test_asyncio/test_tasks.py b/Lib/test/test_asyncio/test_tasks.py
--- a/Lib/test/test_asyncio/test_tasks.py
+++ b/Lib/test/test_asyncio/test_tasks.py
@@ -51,6 +51,7 @@
self.set_event_loop(loop)
t = asyncio.Task(notmuch(), loop=loop)
self.assertIs(t._loop, loop)
+ loop.run_until_complete(t)
loop.close()
def test_async_coroutine(self):
@@ -67,6 +68,7 @@
self.set_event_loop(loop)
t = asyncio.async(notmuch(), loop=loop)
self.assertIs(t._loop, loop)
+ loop.run_until_complete(t)
loop.close()
def test_async_future(self):
@@ -213,6 +215,7 @@
t.add_done_callback(Dummy())
self.assertEqual(repr(t),
'<Task pending %s cb=[<Dummy>()]>' % coro)
+ self.loop.run_until_complete(t)
def test_task_basics(self):
@asyncio.coroutine
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list