Commit e63f1a65 authored by Victor Stinner's avatar Victor Stinner

Merge 3.4 (test_asyncio)

parents 7b58a2bb 72e1eae7
...@@ -619,9 +619,6 @@ class EventLoopTestsMixin: ...@@ -619,9 +619,6 @@ class EventLoopTestsMixin:
self.assertEqual(peercert, self.assertEqual(peercert,
client.get_extra_info('peercert')) client.get_extra_info('peercert'))
# Python disables compression to prevent CRIME attacks by default
self.assertIsNone(client.get_extra_info('compression'))
# test SSL cipher # test SSL cipher
cipher = client.get_extra_info('cipher') cipher = client.get_extra_info('cipher')
self.assertIsInstance(cipher, tuple) self.assertIsInstance(cipher, tuple)
...@@ -639,6 +636,8 @@ class EventLoopTestsMixin: ...@@ -639,6 +636,8 @@ class EventLoopTestsMixin:
client.get_extra_info('cipher')) client.get_extra_info('cipher'))
self.assertEqual(sslobj.getpeercert(), self.assertEqual(sslobj.getpeercert(),
client.get_extra_info('peercert')) client.get_extra_info('peercert'))
self.assertEqual(sslobj.compression(),
client.get_extra_info('compression'))
def _basetest_create_ssl_connection(self, connection_fut, def _basetest_create_ssl_connection(self, connection_fut,
check_sockname=True, check_sockname=True,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment