diff options
| author | Yury Selivanov <yselivanov@sprymix.com> | 2016-05-13 20:11:00 (GMT) |
|---|---|---|
| committer | Yury Selivanov <yselivanov@sprymix.com> | 2016-05-13 20:11:00 (GMT) |
| commit | e9e3a7cd3c491d29a81b9c0a627e469cb3721c94 (patch) | |
| tree | eeaeb2dc0bd5f9bc2ac65a13552aa7819efba95c /Lib/test | |
| parent | 2e413f7cc7d54f2af77b0242605cf3c8adc26a6f (diff) | |
| parent | f11352c1144eff874d56620678a49b5a6b5d3771 (diff) | |
| download | cpython-e9e3a7cd3c491d29a81b9c0a627e469cb3721c94.zip cpython-e9e3a7cd3c491d29a81b9c0a627e469cb3721c94.tar.gz cpython-e9e3a7cd3c491d29a81b9c0a627e469cb3721c94.tar.bz2 | |
Merge 3.5 (asyncio)
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/test_asyncio/test_base_events.py | 1 | ||||
| -rw-r--r-- | Lib/test/test_asyncio/test_futures.py | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/Lib/test/test_asyncio/test_base_events.py b/Lib/test/test_asyncio/test_base_events.py index d660717..a74ac89 100644 --- a/Lib/test/test_asyncio/test_base_events.py +++ b/Lib/test/test_asyncio/test_base_events.py @@ -628,6 +628,7 @@ class BaseEventLoopTests(test_utils.TestCase): fut.add_done_callback(lambda *args: self.loop.stop()) self.loop.run_forever() fut = None # Trigger Future.__del__ or futures._TracebackLogger + support.gc_collect() if PY34: # Future.__del__ in Python 3.4 logs error with # an actual exception context diff --git a/Lib/test/test_asyncio/test_futures.py b/Lib/test/test_asyncio/test_futures.py index 358b190..e800106 100644 --- a/Lib/test/test_asyncio/test_futures.py +++ b/Lib/test/test_asyncio/test_futures.py @@ -242,6 +242,7 @@ class FutureTests(test_utils.TestCase): fut.set_exception(RuntimeError('boom')) del fut test_utils.run_briefly(self.loop) + support.gc_collect() self.assertTrue(m_log.error.called) @mock.patch('asyncio.base_events.logger') |