diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2021-06-11 07:36:17 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-11 07:36:17 (GMT) |
| commit | d7930fb720b5e9db2076b116dffcd52b6ca71438 (patch) | |
| tree | 3707ebb7bd5cf5af5cc0f88ac1c9f322d49f0220 /Lib/test | |
| parent | b613132861839b6d05b67138842b579e1af29f9c (diff) | |
| download | cpython-d7930fb720b5e9db2076b116dffcd52b6ca71438.zip cpython-d7930fb720b5e9db2076b116dffcd52b6ca71438.tar.gz cpython-d7930fb720b5e9db2076b116dffcd52b6ca71438.tar.bz2 | |
bpo-44362: ssl: improve deprecation warnings and docs (GH-26646)
Signed-off-by: Christian Heimes <christian@python.org>
(cherry picked from commit e26014f1c47d26d6097ff7a0f25384bfbde714a9)
Co-authored-by: Christian Heimes <christian@python.org>
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/test_ssl.py | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index 9bd8e22..5dc27df 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -1754,7 +1754,7 @@ class ContextTests(unittest.TestCase): with ctx.wrap_socket(socket.socket(), server_side=True) as sock: self.assertIsInstance(sock, MySSLSocket) - obj = ctx.wrap_bio(ssl.MemoryBIO(), ssl.MemoryBIO()) + obj = ctx.wrap_bio(ssl.MemoryBIO(), ssl.MemoryBIO(), server_side=True) self.assertIsInstance(obj, MySSLObject) def test_num_tickest(self): @@ -2888,24 +2888,29 @@ class ThreadedTests(unittest.TestCase): server_context=client_context, chatty=True, connectionchatty=True, sni_name=hostname) - self.assertIn('called a function you should not call', - str(e.exception)) + self.assertIn( + 'Cannot create a client socket with a PROTOCOL_TLS_SERVER context', + str(e.exception) + ) with self.subTest(client=ssl.PROTOCOL_TLS_SERVER, server=ssl.PROTOCOL_TLS_SERVER): with self.assertRaises(ssl.SSLError) as e: server_params_test(client_context=server_context, server_context=server_context, chatty=True, connectionchatty=True) - self.assertIn('called a function you should not call', - str(e.exception)) + self.assertIn( + 'Cannot create a client socket with a PROTOCOL_TLS_SERVER context', + str(e.exception) + ) with self.subTest(client=ssl.PROTOCOL_TLS_CLIENT, server=ssl.PROTOCOL_TLS_CLIENT): with self.assertRaises(ssl.SSLError) as e: server_params_test(client_context=server_context, server_context=client_context, chatty=True, connectionchatty=True) - self.assertIn('called a function you should not call', - str(e.exception)) + self.assertIn( + 'Cannot create a client socket with a PROTOCOL_TLS_SERVER context', + str(e.exception)) def test_getpeercert(self): if support.verbose: |