Commit 2ec530cd authored by Christian Heimes's avatar Christian Heimes Committed by GitHub

[2.7] bpo-34391: Fix ftplib test for TLS 1.3 (GH-8787) (GH-8791)

Read from data socket to avoid "[SSL] shutdown while in init" exception
during shutdown of the dummy server.
Signed-off-by: default avatarChristian Heimes <christian@python.org>

<!-- issue-number: [bpo-34391](https://www.bugs.python.org/issue34391) -->
https://bugs.python.org/issue34391
<!-- /issue-number -->.
(cherry picked from commit 1590c393)
Co-authored-by: default avatarChristian Heimes <christian@python.org>
parent 00aebabc
......@@ -675,6 +675,7 @@ class TestTLS_FTPClass(TestCase):
# clear text
sock = self.client.transfercmd('list')
self.assertNotIsInstance(sock, ssl.SSLSocket)
self.assertEqual(sock.recv(1024), LIST_DATA.encode('ascii'))
sock.close()
self.assertEqual(self.client.voidresp(), "226 transfer complete")
......@@ -682,6 +683,9 @@ class TestTLS_FTPClass(TestCase):
self.client.prot_p()
sock = self.client.transfercmd('list')
self.assertIsInstance(sock, ssl.SSLSocket)
# consume from SSL socket to finalize handshake and avoid
# "SSLError [SSL] shutdown while in init"
self.assertEqual(sock.recv(1024), LIST_DATA.encode('ascii'))
sock.close()
self.assertEqual(self.client.voidresp(), "226 transfer complete")
......@@ -689,6 +693,7 @@ class TestTLS_FTPClass(TestCase):
self.client.prot_c()
sock = self.client.transfercmd('list')
self.assertNotIsInstance(sock, ssl.SSLSocket)
self.assertEqual(sock.recv(1024), LIST_DATA.encode('ascii'))
sock.close()
self.assertEqual(self.client.voidresp(), "226 transfer complete")
......
Fix ftplib test for TLS 1.3 by reading from data socket.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment