summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2015-09-21 20:20:36 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2015-09-21 20:20:36 (GMT)
commite63f1a65ed1541ef09b18ca8077bd199322f7bf1 (patch)
treefb02d4dceb41647a1c63fcd4b13537f2fe5b893b
parent7b58a2bb1d904850293694b01de3bd21344d0ff2 (diff)
parent72e1eae7bbad324115e37809ffd119e66184d560 (diff)
downloadcpython-e63f1a65ed1541ef09b18ca8077bd199322f7bf1.zip
cpython-e63f1a65ed1541ef09b18ca8077bd199322f7bf1.tar.gz
cpython-e63f1a65ed1541ef09b18ca8077bd199322f7bf1.tar.bz2
Merge 3.4 (test_asyncio)
-rw-r--r--Lib/test/test_asyncio/test_events.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/Lib/test/test_asyncio/test_events.py b/Lib/test/test_asyncio/test_events.py
index 24c3f1e..3488101 100644
--- a/Lib/test/test_asyncio/test_events.py
+++ b/Lib/test/test_asyncio/test_events.py
@@ -619,9 +619,6 @@ class EventLoopTestsMixin:
self.assertEqual(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
cipher = client.get_extra_info('cipher')
self.assertIsInstance(cipher, tuple)
@@ -639,6 +636,8 @@ class EventLoopTestsMixin:
client.get_extra_info('cipher'))
self.assertEqual(sslobj.getpeercert(),
client.get_extra_info('peercert'))
+ self.assertEqual(sslobj.compression(),
+ client.get_extra_info('compression'))
def _basetest_create_ssl_connection(self, connection_fut,
check_sockname=True,