[Python-checkins] r78048 - python/trunk/Lib/test/test_ssl.py

Sun Feb 7 00:23:45 CET 2010

Author: georg.brandl
Date: Sun Feb 7 00:23:45 2010
New Revision: 78048
Log:
We heard you like test failures so we put unbound locals in your test so that you can fail while you fail.
Modified:
 python/trunk/Lib/test/test_ssl.py
Modified: python/trunk/Lib/test/test_ssl.py
==============================================================================

--- python/trunk/Lib/test/test_ssl.py	(original)
+++ python/trunk/Lib/test/test_ssl.py	Sun Feb 7 00:23:45 2010
@@ -1070,9 +1070,9 @@
 ssl_version=ssl.PROTOCOL_TLSv1)
 s.connect((HOST, server.port))
 except ssl.SSLError as x:
- raise support.TestFailed("Unexpected SSL error: " + str(x))
+ self.fail("Unexpected SSL error: " + str(x))
 except Exception as x:
- raise support.TestFailed("Unexpected exception: " + str(x))
+ self.fail("Unexpected exception: " + str(x))
 else:
 # helper methods for standardising recv* method signatures
 def _recv_into():
@@ -1106,7 +1106,7 @@
 outdata = s.read()
 outdata = outdata.decode('ASCII', 'strict')
 if outdata != indata.lower():
- raise support.TestFailed(
+ self.fail(
 "While sending with <<%s>> bad data "
 "<<%r>> (%d) received; "
 "expected <<%r>> (%d)\n" % (
@@ -1116,12 +1116,12 @@
 )
 except ValueError as e:
 if expect_success:
- raise support.TestFailed(
+ self.fail(
 "Failed to send with method <<%s>>; "
 "expected to succeed.\n" % (meth_name,)
 )
 if not str(e).startswith(meth_name):
- raise support.TestFailed(
+ self.fail(
 "Method <<%s>> failed with unexpected "
 "exception message: %s\n" % (
 meth_name, e
@@ -1135,7 +1135,7 @@
 outdata = recv_meth(*args)
 outdata = outdata.decode('ASCII', 'strict')
 if outdata != indata.lower():
- raise support.TestFailed(
+ self.fail(
 "While receiving with <<%s>> bad data "
 "<<%r>> (%d) received; "
 "expected <<%r>> (%d)\n" % (
@@ -1145,12 +1145,12 @@
 )
 except ValueError as e:
 if expect_success:
- raise support.TestFailed(
+ self.fail(
 "Failed to receive with method <<%s>>; "
 "expected to succeed.\n" % (meth_name,)
 )
 if not str(e).startswith(meth_name):
- raise support.TestFailed(
+ self.fail(
 "Method <<%s>> failed with unexpected "
 "exception message: %s\n" % (
 meth_name, e
