Merge 3.5 (asyncio)

This commit is contained in:
Yury Selivanov 2016-05-13 15:43:05 -04:00
commit 91f9def428
1 changed files with 2 additions and 2 deletions

View File

@ -1002,7 +1002,7 @@ class EventLoopTestsMixin:
with mock.patch.object(self.loop, 'call_exception_handler'): with mock.patch.object(self.loop, 'call_exception_handler'):
with test_utils.disable_logger(): with test_utils.disable_logger():
with self.assertRaisesRegex(ssl.SSLError, with self.assertRaisesRegex(ssl.SSLError,
'(?i)certificate.verify.failed '): '(?i)certificate.verify.failed'):
self.loop.run_until_complete(f_c) self.loop.run_until_complete(f_c)
# execute the loop to log the connection error # execute the loop to log the connection error
@ -1036,7 +1036,7 @@ class EventLoopTestsMixin:
with mock.patch.object(self.loop, 'call_exception_handler'): with mock.patch.object(self.loop, 'call_exception_handler'):
with test_utils.disable_logger(): with test_utils.disable_logger():
with self.assertRaisesRegex(ssl.SSLError, with self.assertRaisesRegex(ssl.SSLError,
'(?i)certificate.verify.failed '): '(?i)certificate.verify.failed'):
self.loop.run_until_complete(f_c) self.loop.run_until_complete(f_c)
# execute the loop to log the connection error # execute the loop to log the connection error