Commit5c2191d

authored

bpo-43921: Cleanup test_ssl.test_wrong_cert_tls13() (GH-26520)

Don't catch OSError, and check the SSLError message.

1 parentf349124 commit5c2191dCopy full SHA for 5c2191d

File tree

-12

lines changed

-12

lines changed

Lines changed: 5 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -3192,23 +3192,16 @@ def test_wrong_cert_tls13(self):`
`3192`	`3192`	`client_context.wrap_socket(socket.socket(),`
`3193`	`3193`	`server_hostname=hostname,`
`3194`	`3194`	`suppress_ragged_eofs=False)ass:`
`3195`		`-# TLS 1.3 perform client cert exchange after handshake`
`3196`	`3195`	`s.connect((HOST,server.port))`
`3197`		`-try:`
	`3196`	`+withself.assertRaisesRegex(`
	`3197`	`+ssl.SSLError,`
	`3198`	`+'alert unknown ca\|EOF occurred'`
	`3199`	`+ ):`
	`3200`	`+# TLS 1.3 perform client cert exchange after handshake`
`3198`	`3201`	`s.write(b'data')`
`3199`	`3202`	`s.read(1000)`
`3200`	`3203`	`s.write(b'should have failed already')`
`3201`	`3204`	`s.read(1000)`
`3202`		`-exceptssl.SSLErrorase:`
`3203`		`-ifsupport.verbose:`
`3204`		`-sys.stdout.write("\nSSLError is %r\n"%e)`
`3205`		`-exceptOSErrorase:`
`3206`		`-ife.errno!=errno.ECONNRESET:`
`3207`		`-raise`
`3208`		`-ifsupport.verbose:`
`3209`		`-sys.stdout.write("\nsocket.error is %r\n"%e)`
`3210`		`-else:`
`3211`		`-self.fail("Use of invalid cert should have failed!")`
`3212`	`3205`
`3213`	`3206`	`deftest_rude_shutdown(self):`
`3214`	`3207`	`"""A brutal shutdown of an SSL server should raise an OSError`

Comments

(0)