Commit 24fc481b authored by Jason Madden's avatar Jason Madden

Pull in current versions of test_httplib.py and test_ssl.py for 3.4. Fixes #844.

parent cd77375f
This diff is collapsed.
...@@ -686,7 +686,8 @@ class ContextTests(unittest.TestCase): ...@@ -686,7 +686,8 @@ class ContextTests(unittest.TestCase):
self.assertEqual(ssl.OP_ALL | ssl.OP_NO_TLSv1 | ssl.OP_NO_SSLv3, self.assertEqual(ssl.OP_ALL | ssl.OP_NO_TLSv1 | ssl.OP_NO_SSLv3,
ctx.options) ctx.options)
ctx.options = 0 ctx.options = 0
self.assertEqual(0, ctx.options) # Ubuntu has OP_NO_SSLv3 forced on by default
self.assertEqual(0, ctx.options & ~ssl.OP_NO_SSLv3)
else: else:
with self.assertRaises(ValueError): with self.assertRaises(ValueError):
ctx.options = 0 ctx.options = 0
...@@ -1267,7 +1268,7 @@ class NetworkedTests(unittest.TestCase): ...@@ -1267,7 +1268,7 @@ class NetworkedTests(unittest.TestCase):
# Issue #19919: Windows machines or VMs hosted on Windows # Issue #19919: Windows machines or VMs hosted on Windows
# machines sometimes return EWOULDBLOCK. # machines sometimes return EWOULDBLOCK.
errors = ( errors = (
errno.ECONNREFUSED, errno.EHOSTUNREACH, errno.ECONNREFUSED, errno.EHOSTUNREACH, errno.ETIMEDOUT,
errno.EWOULDBLOCK, errno.EWOULDBLOCK,
) )
self.assertIn(rc, errors) self.assertIn(rc, errors)
...@@ -2292,7 +2293,6 @@ else: ...@@ -2292,7 +2293,6 @@ else:
chatty=True, chatty=True,
connectionchatty=True) connectionchatty=True)
wrapped = False wrapped = False
with server: with server:
s = socket.socket() s = socket.socket()
s.setblocking(1) s.setblocking(1)
...@@ -2309,7 +2309,6 @@ else: ...@@ -2309,7 +2309,6 @@ else:
else: else:
s.send(indata) s.send(indata)
outdata = s.recv(1024) outdata = s.recv(1024)
msg = outdata.strip().lower() msg = outdata.strip().lower()
if indata == b"STARTTLS" and msg.startswith(b"ok"): if indata == b"STARTTLS" and msg.startswith(b"ok"):
# STARTTLS ok, switch to secure mode # STARTTLS ok, switch to secure mode
......
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