Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merge 3.5

This commit is contained in:
Yury Selivanov 2015-11-20 12:58:00 -05:00
parent ded6689117 875e4fbcca
commit 5444de93ac
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Lib/asyncio/test_utils.py
View File

@ -24,6 +24,7 @@ except ImportError: # pragma: no cover
ssl = None ssl = None
from . import base_events from . import base_events
from . import compat
from . import events from . import events
from . import futures from . import futures
from . import selectors from . import selectors
@ -421,6 +422,16 @@ class TestCase(unittest.TestCase):
# in an except block of a generator # in an except block of a generator
self.assertEqual(sys.exc_info(), (None, None, None)) self.assertEqual(sys.exc_info(), (None, None, None))
if not compat.PY34:
# Python 3.3 compatibility
def subTest(self, *args, **kwargs):
class EmptyCM:
def __enter__(self):
pass
def __exit__(self, *exc):
pass
return EmptyCM()
@contextlib.contextmanager @contextlib.contextmanager
def disable_logger(): def disable_logger():

7
Lib/test/test_asyncio/test_base_events.py
View File

@ -782,9 +782,10 @@ class BaseEventLoopTests(test_utils.TestCase):
self.loop._selector.select.return_value = (event_sentinel,) self.loop._selector.select.return_value = (event_sentinel,)
for i in range(1, 3): for i in range(1, 3):
self.loop.call_soon(self.loop.stop) with self.subTest('Loop %d/2' % i):
self.loop.run_forever() self.loop.call_soon(self.loop.stop)
self.assertEqual(callcount, 1) self.loop.run_forever()
self.assertEqual(callcount, 1)
def test_run_once(self): def test_run_once(self):
# Simple test for test_utils.run_once(). It may seem strange # Simple test for test_utils.run_once(). It may seem strange