From 2ec530cd5537dfda5ca0af6ac696e45013ed31d2 Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Thu, 16 Aug 2018 21:38:44 +0200 Subject: [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: Christian Heimes https://bugs.python.org/issue34391 . (cherry picked from commit 1590c393360df059160145e7475754427bfc6680) Co-authored-by: Christian Heimes --- Lib/test/test_ftplib.py | 5 +++++ Misc/NEWS.d/next/Tests/2018-08-16-18-48-47.bpo-34391.ouNfxC.rst | 1 + 2 files changed, 6 insertions(+) create mode 100644 Misc/NEWS.d/next/Tests/2018-08-16-18-48-47.bpo-34391.ouNfxC.rst diff --git a/Lib/test/test_ftplib.py b/Lib/test/test_ftplib.py index e728aa7..8a3eb06 100644 --- a/Lib/test/test_ftplib.py +++ b/Lib/test/test_ftplib.py @@ -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") diff --git a/Misc/NEWS.d/next/Tests/2018-08-16-18-48-47.bpo-34391.ouNfxC.rst b/Misc/NEWS.d/next/Tests/2018-08-16-18-48-47.bpo-34391.ouNfxC.rst new file mode 100644 index 0000000..18702cb --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2018-08-16-18-48-47.bpo-34391.ouNfxC.rst @@ -0,0 +1 @@ +Fix ftplib test for TLS 1.3 by reading from data socket. -- cgit v0.12