summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-02-06 23:23:45 (GMT)
committerGeorg Brandl <georg@python.org>2010-02-06 23:23:45 (GMT)
commitc7ca56d21361ef62a3aa3314f317094312e93ce5 (patch)
tree13e85fc49bde898646f7bcefa4c4311597908939
parentd10d8ee2a1f0e4fd01816b5717eb5cc92684fb37 (diff)
downloadcpython-c7ca56d21361ef62a3aa3314f317094312e93ce5.zip
cpython-c7ca56d21361ef62a3aa3314f317094312e93ce5.tar.gz
cpython-c7ca56d21361ef62a3aa3314f317094312e93ce5.tar.bz2
We heard you like test failures so we put unbound locals in your test so that you can fail while you fail.
-rw-r--r--Lib/test/test_ssl.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index 5aca135..b16c3d6 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -1070,9 +1070,9 @@ else:
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 @@ else:
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 @@ else:
)
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 @@ else:
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 @@ else:
)
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