Commit 4dd20d3c authored by Jason Madden's avatar Jason Madden

Test fixes for 2.6 built without sslv2

parent ae489475
...@@ -59,7 +59,8 @@ for name in dir(__ssl__): ...@@ -59,7 +59,8 @@ for name in dir(__ssl__):
del name, value del name, value
__all__ = __implements__ + __imports__ # Py2.6 can get RAND_status added twice
__all__ = list(set(__implements__) | set(__imports__))
class SSLSocket(socket): class SSLSocket(socket):
......
...@@ -175,19 +175,23 @@ if 'thread' in os.getenv('GEVENT_FILE', ''): ...@@ -175,19 +175,23 @@ if 'thread' in os.getenv('GEVENT_FILE', ''):
# Fails with "OSError: 9 invalid file descriptor"; expect GC/lifetime issues # Fails with "OSError: 9 invalid file descriptor"; expect GC/lifetime issues
] ]
def disabled_tests_extend(lines): if sys.version_info[:2] == (2, 6):
disabled_tests.extend(lines.strip().split('\n'))
if sys.version_info[:2] == (2, 6) and os.environ.get('TRAVIS') == 'true': disabled_tests += [
# somehow these fail with "Permission denied" on travis # SSLv2 May or may not be available depending on the build
disabled_tests_extend(''' 'test_ssl.BasicTests.test_constants',
test_httpservers.CGIHTTPServerTestCase.test_post ]
test_httpservers.CGIHTTPServerTestCase.test_headers_and_content
test_httpservers.CGIHTTPServerTestCase.test_authorization
test_httpservers.SimpleHTTPServerTestCase.test_get
''')
if os.environ.get('TRAVIS') == 'true':
# somehow these fail with "Permission denied" on travis
disabled_tests += [
'test_httpservers.CGIHTTPServerTestCase.test_post',
'test_httpservers.CGIHTTPServerTestCase.test_headers_and_content',
'test_httpservers.CGIHTTPServerTestCase.test_authorization',
'test_httpservers.SimpleHTTPServerTestCase.test_get'
]
if sys.platform == 'darwin': if sys.platform == 'darwin':
disabled_tests += [ disabled_tests += [
...@@ -224,6 +228,7 @@ if sys.version_info[:2] == (3, 4) and sys.version_info[:3] < (3, 4, 4): ...@@ -224,6 +228,7 @@ if sys.version_info[:2] == (3, 4) and sys.version_info[:3] < (3, 4, 4):
'test_ssl.ContextTests.test_options', 'test_ssl.ContextTests.test_options',
'test_ssl.ThreadedTests.test_protocol_sslv23', 'test_ssl.ThreadedTests.test_protocol_sslv23',
'test_ssl.ThreadedTests.test_protocol_sslv3', 'test_ssl.ThreadedTests.test_protocol_sslv3',
'test_httplib.HTTPSTest.test_networked',
] ]
if sys.version_info[:2] >= (3, 4): if sys.version_info[:2] >= (3, 4):
......
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