diff options
| author | Larry Hastings <larry@hastings.org> | 2016-06-27 03:00:51 (GMT) |
|---|---|---|
| committer | Larry Hastings <larry@hastings.org> | 2016-06-27 03:00:51 (GMT) |
| commit | c2f2ef8faa366a5b2ba00f97ec18d9b837d2f495 (patch) | |
| tree | fdc5e70d90855190f434e831c60712e53f1b5a68 /Lib/test | |
| parent | 68a53c5d3964ae2f4658491822f83cf36510f39b (diff) | |
| parent | bddc35643799f1a96693d7a26a82449749ea900d (diff) | |
| download | cpython-c2f2ef8faa366a5b2ba00f97ec18d9b837d2f495.zip cpython-c2f2ef8faa366a5b2ba00f97ec18d9b837d2f495.tar.gz cpython-c2f2ef8faa366a5b2ba00f97ec18d9b837d2f495.tar.bz2 | |
Merge from 3.5.
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/test_ssl.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index 00d437a..7824e9c 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -844,7 +844,8 @@ class ContextTests(unittest.TestCase): self.assertEqual(ssl.OP_ALL | ssl.OP_NO_TLSv1 | ssl.OP_NO_SSLv3, ctx.options) 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: with self.assertRaises(ValueError): ctx.options = 0 |