mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 3.4 (test_asyncio)

This commit is contained in:
Victor Stinner 2015-09-21 22:20:36 +02:00
parent 7b58a2bb1d 72e1eae7bb
commit e63f1a65ed
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Lib/test/test_asyncio/test_events.py
View File

@ -619,9 +619,6 @@ def check_ssl_extra_info(self, client, check_sockname=True,
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 @@ def check_ssl_extra_info(self, client, check_sockname=True,
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,