summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-05-16 23:46:26 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-05-16 23:46:26 (GMT)
commit304740635b6066d11850a36c46991fcea4cdb800 (patch)
tree87be8d3926b1a5b04d9f09eb129143fe9b18a247 /Lib/test
parent9d74b42aca83c3fcf2f45f9f7b505fd688ffa78c (diff)
downloadcpython-304740635b6066d11850a36c46991fcea4cdb800.zip
cpython-304740635b6066d11850a36c46991fcea4cdb800.tar.gz
cpython-304740635b6066d11850a36c46991fcea4cdb800.tar.bz2
"xyzzy" is not a silly enough name for some OpenSSL versions to report an error
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_ssl.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index cf5abe2..5086cc3 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -143,7 +143,7 @@ class BasicSocketTests(unittest.TestCase):
# Error checking can happen at instantiation or when connecting
with self.assertRaisesRegexp(ssl.SSLError, "No cipher can be selected"):
s = ssl.wrap_socket(socket.socket(socket.AF_INET),
- cert_reqs=ssl.CERT_NONE, ciphers="xyzzy")
+ cert_reqs=ssl.CERT_NONE, ciphers="^$:,;?*'dorothyx")
s.connect(remote)
@support.cpython_only
@@ -187,7 +187,7 @@ class ContextTests(unittest.TestCase):
ctx.set_ciphers("ALL")
ctx.set_ciphers("DEFAULT")
with self.assertRaisesRegexp(ssl.SSLError, "No cipher can be selected"):
- ctx.set_ciphers("xyzzy")
+ ctx.set_ciphers("^$:,;?*'dorothyx")
def test_verify(self):
ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1)