[Python-checkins] cpython (merge 3.5 -> default): Merge 3.5 (test_asyncio)

Mon Sep 21 22:22:25 CEST 2015

https://hg.python.org/cpython/rev/59ad04ce3c29
changeset: 98144:59ad04ce3c29
parent: 98141:5230115de64d
parent: 98143:09d27433983f
user: Victor Stinner <victor.stinner at gmail.com>
date: Mon Sep 21 22:20:52 2015 +0200
summary:
 Merge 3.5 (test_asyncio)
files:
 Lib/test/test_asyncio/test_events.py | 5 ++---
 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
--- a/Lib/test/test_asyncio/test_events.py
+++ b/Lib/test/test_asyncio/test_events.py
@@ -619,9 +619,6 @@
 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 @@
 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,
-- 
Repository URL: https://hg.python.org/cpython
