summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-05-16 19:56:32 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-05-16 19:56:32 (GMT)
commit65ec8ae47fa4bb0a3c2ef815ca1b03f3519398bc (patch)
treeb7cc83b7967ae302d213326f35d68ffa8bf3abc6 /Lib
parent467f28de03bea1c27c33d6c0eb214b56cc837557 (diff)
downloadcpython-65ec8ae47fa4bb0a3c2ef815ca1b03f3519398bc.zip
cpython-65ec8ae47fa4bb0a3c2ef815ca1b03f3519398bc.tar.gz
cpython-65ec8ae47fa4bb0a3c2ef815ca1b03f3519398bc.tar.bz2
Fix (hopefully) the remaining test_ssl buildbot failures
Diffstat (limited to 'Lib')
-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 6cd3a5e..36ed3aa 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -142,7 +142,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="^$:,;?*'dorothyx")
+ cert_reqs=ssl.CERT_NONE, ciphers="xyzzy")
s.connect(remote)
@support.cpython_only
@@ -186,7 +186,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("^$:,;?*'dorothyx")
+ ctx.set_ciphers("xyzzy")
def test_verify(self):
ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1)