summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2015-01-27 23:30:40 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2015-01-27 23:30:40 (GMT)
commitff018e406cd96d117b54edcb30808a56fc2f689a (patch)
tree79641c031a2bbd8f80387304dd6b2867bb14a7a0 /Lib/test
parentb68c420d8ad38f8e4f7625f388a6219ea61cd203 (diff)
downloadcpython-ff018e406cd96d117b54edcb30808a56fc2f689a.zip
cpython-ff018e406cd96d117b54edcb30808a56fc2f689a.tar.gz
cpython-ff018e406cd96d117b54edcb30808a56fc2f689a.tar.bz2
asyncio: sync with Tulip
* Remove unused SSLProtocol._closing attribute * test_sslproto: skip test if ssl module is missing * Python issue #23208: Don't use the traceback of the current handle if we already know the traceback of the source. The handle may be more revelant, but having 3 tracebacks (handle, source, exception) becomes more difficult to read. The handle may be preferred later but it requires more work to make this choice.
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_asyncio/test_sslproto.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/Lib/test/test_asyncio/test_sslproto.py b/Lib/test/test_asyncio/test_sslproto.py
index 812dedb..b1a61c4 100644
--- a/Lib/test/test_asyncio/test_sslproto.py
+++ b/Lib/test/test_asyncio/test_sslproto.py
@@ -2,6 +2,10 @@
import unittest
from unittest import mock
+try:
+ import ssl
+except ImportError:
+ ssl = None
import asyncio
from asyncio import sslproto
@@ -14,6 +18,7 @@ class SslProtoHandshakeTests(test_utils.TestCase):
self.loop = asyncio.new_event_loop()
self.set_event_loop(self.loop)
+ @unittest.skipIf(ssl is None, 'No ssl module')
def test_cancel_handshake(self):
# Python issue #23197: cancelling an handshake must not raise an
# exception or log an error, even if the handshake failed