mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-11 12:29:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

in ssl tests rely on IOError.errno rather thanf IOError.strerror for better compatibility across platforms.

Browse source
This commit is contained in:
Giampaolo Rodolà 2010-08-29 20:56:56 +00:00
parent 51078b1e5d
commit cd9dfb919a
1 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Lib/test/test_ssl.py
View file

@ -180,10 +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.assertRaisesRegexp(IOError, "No such file"): with self.assertRaises(IOError) as err:
ssl.wrap_socket(sock, certfile=WRONGCERT) ssl.wrap_socket(socket.socket(), certfile=WRONGCERT)
ssl.wrap_socket(sock, keyfile=WRONGCERT) self.assertEqual(err.errno, errno.ENOENT)
ssl.wrap_socket(sock, certfile=WRONGCERT, keyfile=WRONGCERT) # XXX - temporarily disabled as per issue #9711
#with self.assertRaises(IOError) as err:
# ssl.wrap_socket(socket.socket(), keyfile=WRONGCERT)
# self.assertEqual(err.errno, errno.ENOENT)
with self.assertRaises(IOError) as err:
ssl.wrap_socket(socket.socket(), certfile=WRONGCERT, keyfile=WRONGCERT)
self.assertEqual(err.errno, errno.ENOENT)
class ContextTests(unittest.TestCase): class ContextTests(unittest.TestCase):
@ -253,8 +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.assertRaisesRegexp(IOError, "No such file"): with self.assertRaises(IOError) as err:
ctx.load_cert_chain(WRONGCERT) ctx.load_cert_chain(WRONGCERT)
self.assertEqual(err.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"):
@ -283,8 +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.assertRaisesRegexp(IOError, "No such file"): with self.assertRaises(IOError) as err:
ctx.load_verify_locations(WRONGCERT) ctx.load_verify_locations(WRONGCERT)
self.assertEqual(err.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)
@ -877,8 +885,10 @@ else:
if support.verbose: if support.verbose:
sys.stdout.write("\nsocket.error is %s\n" % x[1]) sys.stdout.write("\nsocket.error is %s\n" % x[1])
except IOError as x: except IOError as x:
if x.errno != errno.ENOENT:
raise
if support.verbose: if support.verbose:
sys.stdout.write("\nsocket.error is %s\n" % str(x)) sys.stdout.write("\IOError is %s\n" % str(x))
else: else:
raise AssertionError("Use of invalid cert should have failed!") raise AssertionError("Use of invalid cert should have failed!")
finally: finally: