mirror of
https://github.com/python/cpython.git
synced 2025-09-26 18:29:57 +00:00
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 ........
This commit is contained in:
parent
6e2824dc35
commit
d75b2a90d9
1 changed files with 3 additions and 3 deletions
|
@ -659,7 +659,7 @@ 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])
|
||||||
else:
|
else:
|
||||||
self.fail("Use of invalid cert should have failed!")
|
raise AssertionError("Use of invalid cert should have failed!")
|
||||||
finally:
|
finally:
|
||||||
server.stop()
|
server.stop()
|
||||||
server.join()
|
server.join()
|
||||||
|
@ -704,7 +704,7 @@ else:
|
||||||
if support.verbose:
|
if support.verbose:
|
||||||
sys.stdout.write(" client: read %r\n" % outdata)
|
sys.stdout.write(" client: read %r\n" % outdata)
|
||||||
if outdata != indata.lower():
|
if outdata != indata.lower():
|
||||||
self.fail(
|
raise AssertionError(
|
||||||
"bad data <<%r>> (%d) received; expected <<%r>> (%d)\n"
|
"bad data <<%r>> (%d) received; expected <<%r>> (%d)\n"
|
||||||
% (outdata[:20], len(outdata),
|
% (outdata[:20], len(outdata),
|
||||||
indata[:20].lower(), len(indata)))
|
indata[:20].lower(), len(indata)))
|
||||||
|
@ -752,7 +752,7 @@ else:
|
||||||
raise
|
raise
|
||||||
else:
|
else:
|
||||||
if not expect_success:
|
if not expect_success:
|
||||||
self.fail(
|
raise AssertionError(
|
||||||
"Client protocol %s succeeded with server protocol %s!"
|
"Client protocol %s succeeded with server protocol %s!"
|
||||||
% (ssl.get_protocol_name(client_protocol),
|
% (ssl.get_protocol_name(client_protocol),
|
||||||
ssl.get_protocol_name(server_protocol)))
|
ssl.get_protocol_name(server_protocol)))
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue