summaryrefslogtreecommitdiff
path: root/Lib/test
diff options
context:
space:
mode:
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_asyncio/test_base_events.py4
-rw-r--r--Lib/test/test_asyncio/test_events.py66
-rw-r--r--Lib/test/test_asyncio/test_futures.py56
-rw-r--r--Lib/test/test_asyncio/test_tasks.py78
4 files changed, 129 insertions, 75 deletions
diff --git a/Lib/test/test_asyncio/test_base_events.py b/Lib/test/test_asyncio/test_base_events.py
index 773a28480a..0aa7a8d163 100644
--- a/Lib/test/test_asyncio/test_base_events.py
+++ b/Lib/test/test_asyncio/test_base_events.py
@@ -1016,14 +1016,14 @@ class BaseEventLoopWithSelectorTests(test_utils.TestCase):
self.loop.run_forever()
fmt, *args = m_logger.warning.call_args[0]
self.assertRegex(fmt % tuple(args),
- "^Executing Handle.*stop_loop_cb.* took .* seconds$")
+ "^Executing <Handle.*stop_loop_cb.*> took .* seconds$")
# slow task
asyncio.async(stop_loop_coro(self.loop), loop=self.loop)
self.loop.run_forever()
fmt, *args = m_logger.warning.call_args[0]
self.assertRegex(fmt % tuple(args),
- "^Executing Task.*stop_loop_coro.* took .* seconds$")
+ "^Executing <Task.*stop_loop_coro.*> took .* seconds$")
if __name__ == '__main__':
diff --git a/Lib/test/test_asyncio/test_events.py b/Lib/test/test_asyncio/test_events.py
index 020d12303d..d3dbd3a6c6 100644
--- a/Lib/test/test_asyncio/test_events.py
+++ b/Lib/test/test_asyncio/test_events.py
@@ -1747,7 +1747,7 @@ else:
return asyncio.SelectorEventLoop(selectors.SelectSelector())
-def noop():
+def noop(*args):
pass
@@ -1797,50 +1797,52 @@ class HandleTests(unittest.TestCase):
h = asyncio.Handle(lambda: None, (), self.loop)
wd['h'] = h # Would fail without __weakref__ slot.
- def test_repr(self):
+ def test_handle_repr(self):
# simple function
h = asyncio.Handle(noop, (), self.loop)
src = test_utils.get_function_source(noop)
self.assertEqual(repr(h),
- 'Handle(noop at %s:%s, ())' % src)
+ '<Handle noop() at %s:%s>' % src)
# cancelled handle
h.cancel()
self.assertEqual(repr(h),
- 'Handle(noop at %s:%s, ())<cancelled>' % src)
+ '<Handle cancelled noop() at %s:%s>' % src)
# decorated function
cb = asyncio.coroutine(noop)
h = asyncio.Handle(cb, (), self.loop)
self.assertEqual(repr(h),
- 'Handle(noop at %s:%s, ())' % src)
+ '<Handle noop() at %s:%s>' % src)
# partial function
- cb = functools.partial(noop)
- h = asyncio.Handle(cb, (), self.loop)
+ cb = functools.partial(noop, 1, 2)
+ h = asyncio.Handle(cb, (3,), self.loop)
filename, lineno = src
- regex = (r'^Handle\(functools.partial\('
- r'<function noop .*>\) at %s:%s, '
- r'\(\)\)$' % (re.escape(filename), lineno))
+ regex = (r'^<Handle noop\(1, 2\)\(3\) at %s:%s>$'
+ % (re.escape(filename), lineno))
self.assertRegex(repr(h), regex)
# partial method
if sys.version_info >= (3, 4):
- method = HandleTests.test_repr
+ method = HandleTests.test_handle_repr
cb = functools.partialmethod(method)
src = test_utils.get_function_source(method)
h = asyncio.Handle(cb, (), self.loop)
filename, lineno = src
- regex = (r'^Handle\(functools.partialmethod\('
- r'<function HandleTests.test_repr .*>, , \) at %s:%s, '
- r'\(\)\)$' % (re.escape(filename), lineno))
+ cb_regex = r'<function HandleTests.test_handle_repr .*>'
+ cb_regex = (r'functools.partialmethod\(%s, , \)\(\)' % cb_regex)
+ regex = (r'^<Handle %s at %s:%s>$'
+ % (cb_regex, re.escape(filename), lineno))
self.assertRegex(repr(h), regex)
-
class TimerTests(unittest.TestCase):
+ def setUp(self):
+ self.loop = mock.Mock()
+
def test_hash(self):
when = time.monotonic()
h = asyncio.TimerHandle(when, lambda: False, (),
@@ -1858,29 +1860,37 @@ class TimerTests(unittest.TestCase):
self.assertIs(h._args, args)
self.assertFalse(h._cancelled)
- r = repr(h)
- self.assertTrue(r.endswith('())'))
-
+ # cancel
h.cancel()
self.assertTrue(h._cancelled)
- r = repr(h)
- self.assertTrue(r.endswith('())<cancelled>'), r)
+ # when cannot be None
self.assertRaises(AssertionError,
asyncio.TimerHandle, None, callback, args,
- mock.Mock())
+ self.loop)
- def test_timer_comparison(self):
- loop = mock.Mock()
+ def test_timer_repr(self):
+ # simple function
+ h = asyncio.TimerHandle(123, noop, (), self.loop)
+ src = test_utils.get_function_source(noop)
+ self.assertEqual(repr(h),
+ '<TimerHandle when=123 noop() at %s:%s>' % src)
+ # cancelled handle
+ h.cancel()
+ self.assertEqual(repr(h),
+ '<TimerHandle cancelled when=123 noop() at %s:%s>'
+ % src)
+
+ def test_timer_comparison(self):
def callback(*args):
return args
when = time.monotonic()
- h1 = asyncio.TimerHandle(when, callback, (), loop)
- h2 = asyncio.TimerHandle(when, callback, (), loop)
+ h1 = asyncio.TimerHandle(when, callback, (), self.loop)
+ h2 = asyncio.TimerHandle(when, callback, (), self.loop)
# TODO: Use assertLess etc.
self.assertFalse(h1 < h2)
self.assertFalse(h2 < h1)
@@ -1896,8 +1906,8 @@ class TimerTests(unittest.TestCase):
h2.cancel()
self.assertFalse(h1 == h2)
- h1 = asyncio.TimerHandle(when, callback, (), loop)
- h2 = asyncio.TimerHandle(when + 10.0, callback, (), loop)
+ h1 = asyncio.TimerHandle(when, callback, (), self.loop)
+ h2 = asyncio.TimerHandle(when + 10.0, callback, (), self.loop)
self.assertTrue(h1 < h2)
self.assertFalse(h2 < h1)
self.assertTrue(h1 <= h2)
@@ -1909,7 +1919,7 @@ class TimerTests(unittest.TestCase):
self.assertFalse(h1 == h2)
self.assertTrue(h1 != h2)
- h3 = asyncio.Handle(callback, (), loop)
+ h3 = asyncio.Handle(callback, (), self.loop)
self.assertIs(NotImplemented, h1.__eq__(h3))
self.assertIs(NotImplemented, h1.__ne__(h3))
diff --git a/Lib/test/test_asyncio/test_futures.py b/Lib/test/test_asyncio/test_futures.py
index a230d61476..8485a5e27f 100644
--- a/Lib/test/test_asyncio/test_futures.py
+++ b/Lib/test/test_asyncio/test_futures.py
@@ -1,6 +1,7 @@
"""Tests for futures.py."""
import concurrent.futures
+import re
import threading
import unittest
from unittest import mock
@@ -12,6 +13,12 @@ from asyncio import test_utils
def _fakefunc(f):
return f
+def first_cb():
+ pass
+
+def last_cb():
+ pass
+
class FutureTests(test_utils.TestCase):
@@ -95,39 +102,60 @@ class FutureTests(test_utils.TestCase):
# The second "yield from f" does not yield f.
self.assertEqual(next(g), ('C', 42)) # yield 'C', y.
- def test_repr(self):
+ def test_future_repr(self):
f_pending = asyncio.Future(loop=self.loop)
- self.assertEqual(repr(f_pending), 'Future<PENDING>')
+ self.assertEqual(repr(f_pending), '<Future pending>')
f_pending.cancel()
f_cancelled = asyncio.Future(loop=self.loop)
f_cancelled.cancel()
- self.assertEqual(repr(f_cancelled), 'Future<CANCELLED>')
+ self.assertEqual(repr(f_cancelled), '<Future cancelled>')
f_result = asyncio.Future(loop=self.loop)
f_result.set_result(4)
- self.assertEqual(repr(f_result), 'Future<result=4>')
+ self.assertEqual(repr(f_result), '<Future finished result=4>')
self.assertEqual(f_result.result(), 4)
exc = RuntimeError()
f_exception = asyncio.Future(loop=self.loop)
f_exception.set_exception(exc)
- self.assertEqual(repr(f_exception), 'Future<exception=RuntimeError()>')
+ self.assertEqual(repr(f_exception), '<Future finished exception=RuntimeError()>')
self.assertIs(f_exception.exception(), exc)
- f_few_callbacks = asyncio.Future(loop=self.loop)
- f_few_callbacks.add_done_callback(_fakefunc)
- self.assertIn('Future<PENDING, [<function _fakefunc',
- repr(f_few_callbacks))
- f_few_callbacks.cancel()
+ def func_repr(func):
+ filename, lineno = test_utils.get_function_source(func)
+ text = '%s() at %s:%s' % (func.__qualname__, filename, lineno)
+ return re.escape(text)
+
+ f_one_callbacks = asyncio.Future(loop=self.loop)
+ f_one_callbacks.add_done_callback(_fakefunc)
+ fake_repr = func_repr(_fakefunc)
+ self.assertRegex(repr(f_one_callbacks),
+ r'<Future pending cb=\[%s\]>' % fake_repr)
+ f_one_callbacks.cancel()
+ self.assertEqual(repr(f_one_callbacks),
+ '<Future cancelled>')
+
+ f_two_callbacks = asyncio.Future(loop=self.loop)
+ f_two_callbacks.add_done_callback(first_cb)
+ f_two_callbacks.add_done_callback(last_cb)
+ first_repr = func_repr(first_cb)
+ last_repr = func_repr(last_cb)
+ self.assertRegex(repr(f_two_callbacks),
+ r'<Future pending cb=\[%s, %s\]>'
+ % (first_repr, last_repr))
f_many_callbacks = asyncio.Future(loop=self.loop)
- for i in range(20):
+ f_many_callbacks.add_done_callback(first_cb)
+ for i in range(8):
f_many_callbacks.add_done_callback(_fakefunc)
- r = repr(f_many_callbacks)
- self.assertIn('Future<PENDING, [<function _fakefunc', r)
- self.assertIn('<18 more>', r)
+ f_many_callbacks.add_done_callback(last_cb)
+ cb_regex = r'%s, <8 more>, %s' % (first_repr, last_repr)
+ self.assertRegex(repr(f_many_callbacks),
+ r'<Future pending cb=\[%s\]>' % cb_regex)
f_many_callbacks.cancel()
+ self.assertEqual(repr(f_many_callbacks),
+ '<Future cancelled>')
def test_copy_state(self):
# Test the internal _copy_state method since it's being directly
diff --git a/Lib/test/test_asyncio/test_tasks.py b/Lib/test/test_asyncio/test_tasks.py
index 3037f60dda..78517450d1 100644
--- a/Lib/test/test_asyncio/test_tasks.py
+++ b/Lib/test/test_asyncio/test_tasks.py
@@ -26,7 +26,7 @@ def coroutine_function():
class Dummy:
def __repr__(self):
- return 'Dummy()'
+ return '<Dummy>'
def __call__(self, *args):
pass
@@ -122,6 +122,7 @@ class TaskTests(test_utils.TestCase):
yield from []
return 'abc'
+ # test coroutine function
self.assertEqual(notmuch.__name__, 'notmuch')
if PY35:
self.assertEqual(notmuch.__qualname__,
@@ -131,72 +132,87 @@ class TaskTests(test_utils.TestCase):
filename, lineno = test_utils.get_function_source(notmuch)
src = "%s:%s" % (filename, lineno)
+ # test coroutine object
gen = notmuch()
+ if PY35:
+ coro_qualname = 'TaskTests.test_task_repr.<locals>.notmuch'
+ else:
+ coro_qualname = 'notmuch'
self.assertEqual(gen.__name__, 'notmuch')
if PY35:
self.assertEqual(gen.__qualname__,
- 'TaskTests.test_task_repr.<locals>.notmuch')
+ coro_qualname)
+ # test pending Task
t = asyncio.Task(gen, loop=self.loop)
t.add_done_callback(Dummy())
+ coro = '%s() at %s' % (coro_qualname, src)
self.assertEqual(repr(t),
- 'Task(<notmuch at %s>)<PENDING, [Dummy()]>' % src)
+ '<Task pending %s cb=[<Dummy>()]>' % coro)
+ # test cancelling Task
t.cancel() # Does not take immediate effect!
self.assertEqual(repr(t),
- 'Task(<notmuch at %s>)<CANCELLING, [Dummy()]>' % src)
+ '<Task cancelling %s cb=[<Dummy>()]>' % coro)
+
+ # test cancelled Task
self.assertRaises(asyncio.CancelledError,
self.loop.run_until_complete, t)
+ coro = '%s() done at %s' % (coro_qualname, src)
self.assertEqual(repr(t),
- 'Task(<notmuch done at %s:%s>)<CANCELLED>'
- % (filename, lineno))
+ '<Task cancelled %s>' % coro)
+ # test finished Task
t = asyncio.Task(notmuch(), loop=self.loop)
self.loop.run_until_complete(t)
self.assertEqual(repr(t),
- "Task(<notmuch done at %s:%s>)<result='abc'>"
- % (filename, lineno))
+ "<Task finished %s result='abc'>" % coro)
- def test_task_repr_custom(self):
+ def test_task_repr_coro_decorator(self):
@asyncio.coroutine
def notmuch():
- pass
+ # notmuch() function doesn't use yield from: it will be wrapped by
+ # @coroutine decorator
+ return 123
+ # test coroutine function
self.assertEqual(notmuch.__name__, 'notmuch')
- self.assertEqual(notmuch.__module__, __name__)
if PY35:
self.assertEqual(notmuch.__qualname__,
- 'TaskTests.test_task_repr_custom.<locals>.notmuch')
-
- class T(asyncio.Future):
- def __repr__(self):
- return 'T[]'
-
- class MyTask(asyncio.Task, T):
- def __repr__(self):
- return super().__repr__()
+ 'TaskTests.test_task_repr_coro_decorator.<locals>.notmuch')
+ self.assertEqual(notmuch.__module__, __name__)
+ # test coroutine object
gen = notmuch()
- if PY35 or tasks._DEBUG:
+ if PY35:
# On Python >= 3.5, generators now inherit the name of the
# function, as expected, and have a qualified name (__qualname__
- # attribute). In debug mode, @coroutine decorator uses CoroWrapper
- # which gets its name (__name__ attribute) from the wrapped
- # coroutine function.
+ # attribute).
coro_name = 'notmuch'
+ coro_qualname = 'TaskTests.test_task_repr_coro_decorator.<locals>.notmuch'
+ elif tasks._DEBUG:
+ # In debug mode, @coroutine decorator uses CoroWrapper which gets
+ # its name (__name__ attribute) from the wrapped coroutine
+ # function.
+ coro_name = coro_qualname = 'notmuch'
else:
# On Python < 3.5, generators inherit the name of the code, not of
# the function. See: http://bugs.python.org/issue21205
- coro_name = 'coro'
+ coro_name = coro_qualname = 'coro'
self.assertEqual(gen.__name__, coro_name)
if PY35:
- self.assertEqual(gen.__qualname__,
- 'TaskTests.test_task_repr_custom.<locals>.notmuch')
+ self.assertEqual(gen.__qualname__, coro_qualname)
+
+ # format the coroutine object
+ code = gen.gi_code
+ coro = ('%s() at %s:%s'
+ % (coro_qualname, code.co_filename, code.co_firstlineno))
- t = MyTask(gen, loop=self.loop)
- filename = gen.gi_code.co_filename
- lineno = gen.gi_frame.f_lineno
- self.assertEqual(repr(t), 'T[](<%s at %s:%s>)' % (coro_name, filename, lineno))
+ # test pending Task
+ t = asyncio.Task(gen, loop=self.loop)
+ t.add_done_callback(Dummy())
+ self.assertEqual(repr(t),
+ '<Task pending %s cb=[<Dummy>()]>' % coro)
def test_task_basics(self):
@asyncio.coroutine
View Lorry Controller Status