[Python-checkins] [2.7] bpo-34391: Fix ftplib test for TLS 1.3 (GH-8787) (GH-8791)
Christian Heimes
webhook-mailer at python.org
Thu Aug 16 15:38:46 EDT 2018
https://github.com/python/cpython/commit/2ec530cd5537dfda5ca0af6ac696e45013ed31d2
commit: 2ec530cd5537dfda5ca0af6ac696e45013ed31d2
branch: 2.7
author: Christian Heimes <christian at python.org>
committer: GitHub <noreply at github.com>
date: 2018-08-16T21:38:44+02:00
summary:
[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 <christian at python.org>
<!-- issue-number: [bpo-34391](https://www.bugs.python.org/issue34391) -->
https://bugs.python.org/issue34391
<!-- /issue-number -->.
(cherry picked from commit 1590c393360df059160145e7475754427bfc6680)
Co-authored-by: Christian Heimes <christian at python.org>
files:
A Misc/NEWS.d/next/Tests/2018-08-16-18-48-47.bpo-34391.ouNfxC.rst
M Lib/test/test_ftplib.py
diff --git a/Lib/test/test_ftplib.py b/Lib/test/test_ftplib.py
index e728aa70f9ea..8a3eb067a446 100644
--- a/Lib/test/test_ftplib.py
+++ b/Lib/test/test_ftplib.py
@@ -675,6 +675,7 @@ def test_data_connection(self):
# 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 @@ def test_data_connection(self):
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 @@ def test_data_connection(self):
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 000000000000..18702cbac312
--- /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.
More information about the Python-checkins
mailing list