mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-09 18:32:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

dedent some lines in test_ssl so that they are actually executed

Browse source
This commit is contained in:
Giampaolo Rodolà 2010-08-29 22:50:39 +00:00
parent cd9dfb919a
commit 4a656ebe05
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Lib/test/test_ssl.py
View file

@ -180,16 +180,16 @@ class BasicSocketTests(unittest.TestCase):
s = ssl.wrap_socket(sock, server_side=True, certfile=CERTFILE) s = ssl.wrap_socket(sock, server_side=True, certfile=CERTFILE)
self.assertRaisesRegexp(ValueError, "can't connect in server-side mode", self.assertRaisesRegexp(ValueError, "can't connect in server-side mode",
s.connect, (HOST, 8080)) s.connect, (HOST, 8080))
with self.assertRaises(IOError) as err: with self.assertRaises(IOError) as cm:
ssl.wrap_socket(socket.socket(), certfile=WRONGCERT) ssl.wrap_socket(socket.socket(), certfile=WRONGCERT)
self.assertEqual(err.errno, errno.ENOENT) self.assertEqual(cm.exception.errno, errno.ENOENT)
# XXX - temporarily disabled as per issue #9711 # XXX - temporarily disabled as per issue #9711
#with self.assertRaises(IOError) as err: #with self.assertRaises(IOError) as cm:
# ssl.wrap_socket(socket.socket(), keyfile=WRONGCERT) # ssl.wrap_socket(socket.socket(), keyfile=WRONGCERT)
# self.assertEqual(err.errno, errno.ENOENT) #self.assertEqual(cm.exception.errno, errno.ENOENT)
with self.assertRaises(IOError) as err: with self.assertRaises(IOError) as cm:
ssl.wrap_socket(socket.socket(), certfile=WRONGCERT, keyfile=WRONGCERT) ssl.wrap_socket(socket.socket(), certfile=WRONGCERT, keyfile=WRONGCERT)
self.assertEqual(err.errno, errno.ENOENT) self.assertEqual(cm.exception.errno, errno.ENOENT)
class ContextTests(unittest.TestCase): class ContextTests(unittest.TestCase):
@ -259,9 +259,9 @@ class ContextTests(unittest.TestCase):
ctx.load_cert_chain(CERTFILE) ctx.load_cert_chain(CERTFILE)
ctx.load_cert_chain(CERTFILE, keyfile=CERTFILE) ctx.load_cert_chain(CERTFILE, keyfile=CERTFILE)
self.assertRaises(TypeError, ctx.load_cert_chain, keyfile=CERTFILE) self.assertRaises(TypeError, ctx.load_cert_chain, keyfile=CERTFILE)
with self.assertRaises(IOError) as err: with self.assertRaises(IOError) as cm:
ctx.load_cert_chain(WRONGCERT) ctx.load_cert_chain(WRONGCERT)
self.assertEqual(err.errno, errno.ENOENT) self.assertEqual(cm.exception.errno, errno.ENOENT)
with self.assertRaisesRegexp(ssl.SSLError, "PEM lib"): with self.assertRaisesRegexp(ssl.SSLError, "PEM lib"):
ctx.load_cert_chain(BADCERT) ctx.load_cert_chain(BADCERT)
with self.assertRaisesRegexp(ssl.SSLError, "PEM lib"): with self.assertRaisesRegexp(ssl.SSLError, "PEM lib"):
@ -290,9 +290,9 @@ class ContextTests(unittest.TestCase):
ctx.load_verify_locations(cafile=BYTES_CERTFILE, capath=None) ctx.load_verify_locations(cafile=BYTES_CERTFILE, capath=None)
self.assertRaises(TypeError, ctx.load_verify_locations) self.assertRaises(TypeError, ctx.load_verify_locations)
self.assertRaises(TypeError, ctx.load_verify_locations, None, None) self.assertRaises(TypeError, ctx.load_verify_locations, None, None)
with self.assertRaises(IOError) as err: with self.assertRaises(IOError) as cm:
ctx.load_verify_locations(WRONGCERT) ctx.load_verify_locations(WRONGCERT)
self.assertEqual(err.errno, errno.ENOENT) self.assertEqual(cm.exception.errno, errno.ENOENT)
with self.assertRaisesRegexp(ssl.SSLError, "PEM lib"): with self.assertRaisesRegexp(ssl.SSLError, "PEM lib"):
ctx.load_verify_locations(BADCERT) ctx.load_verify_locations(BADCERT)
ctx.load_verify_locations(CERTFILE, CAPATH) ctx.load_verify_locations(CERTFILE, CAPATH)