Commit 3d5c3dbc authored by Jason Madden's avatar Jason Madden

test_ssl.py works on python 2.7.11 since SSLv3 is disabled by default now.

parent 30e5c704
...@@ -520,7 +520,6 @@ class loop(object): ...@@ -520,7 +520,6 @@ class loop(object):
libev.ev_run(self._ptr, flags) libev.ev_run(self._ptr, flags)
def reinit(self): def reinit(self):
libev.ev_loop_fork(self._ptr) libev.ev_loop_fork(self._ptr)
......
...@@ -1210,6 +1210,9 @@ else: ...@@ -1210,6 +1210,9 @@ else:
"""Connecting to an SSLv23 server with various client options""" """Connecting to an SSLv23 server with various client options"""
if test_support.verbose: if test_support.verbose:
sys.stdout.write("\n") sys.stdout.write("\n")
if sys.version_info[:3] >= (2, 7, 11):
# http://bugs.python.org/issue25530
self.skipTest("SSLv23 Disabled in 2.7.11")
try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, True) try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, True)
try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv23, True) try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv23, True)
try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_TLSv1, True) try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_TLSv1, True)
......
...@@ -487,6 +487,7 @@ class TestBasic(greentest.TestCase): ...@@ -487,6 +487,7 @@ class TestBasic(greentest.TestCase):
def test_spawn_raw_kwargs(self): def test_spawn_raw_kwargs(self):
value = [] value = []
def f(*args, **kwargs): def f(*args, **kwargs):
value.append(args) value.append(args)
value.append(kwargs) value.append(kwargs)
......
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