summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-05-06 14:15:10 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-05-06 14:15:10 (GMT)
commitd75b2a90d9f3f3342f5f07631f74d9c7ba34c6b3 (patch)
tree134bc178c56f2667cecfa6dfa6d7750c850b7df9 /Lib
parent6e2824dc35685fc27f551f96418761e383e91fae (diff)
downloadcpython-d75b2a90d9f3f3342f5f07631f74d9c7ba34c6b3.zip
cpython-d75b2a90d9f3f3342f5f07631f74d9c7ba34c6b3.tar.gz
cpython-d75b2a90d9f3f3342f5f07631f74d9c7ba34c6b3.tar.bz2
Merged revisions 80869 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r80869 | antoine.pitrou | 2010-05-06 16:11:23 +0200 (jeu., 06 mai 2010) | 3 lines `self` doesn't exist here ........
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_ssl.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index a82a784..7895b4a 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -659,7 +659,7 @@ else:
if support.verbose:
sys.stdout.write("\nsocket.error is %s\n" % x[1])
else:
- self.fail("Use of invalid cert should have failed!")
+ raise AssertionError("Use of invalid cert should have failed!")
finally:
server.stop()
server.join()
@@ -704,7 +704,7 @@ else:
if support.verbose:
sys.stdout.write(" client: read %r\n" % outdata)
if outdata != indata.lower():
- self.fail(
+ raise AssertionError(
"bad data <<%r>> (%d) received; expected <<%r>> (%d)\n"
% (outdata[:20], len(outdata),
indata[:20].lower(), len(indata)))
@@ -752,7 +752,7 @@ else:
raise
else:
if not expect_success:
- self.fail(
+ raise AssertionError(
"Client protocol %s succeeded with server protocol %s!"
% (ssl.get_protocol_name(client_protocol),
ssl.get_protocol_name(server_protocol)))