diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2018-08-16 19:38:03 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@python.org> | 2018-08-16 19:38:03 (GMT) |
| commit | cabe916dc694997d4892b58986e73a713d5a2f8d (patch) | |
| tree | 012c9cb1e6703b0fd55514c9be3e2958e2d696b5 | |
| parent | b14ab447ee3f47d479d899b4001d870569a76c44 (diff) | |
| download | cpython-cabe916dc694997d4892b58986e73a713d5a2f8d.zip cpython-cabe916dc694997d4892b58986e73a713d5a2f8d.tar.gz cpython-cabe916dc694997d4892b58986e73a713d5a2f8d.tar.bz2 | |
[3.6] bpo-34391: Fix ftplib test for TLS 1.3 (GH-8787) (#8790)
Read from data socket to avoid "[SSL] shutdown while in init" exception
during shutdown of the dummy server.
Signed-off-by: Christian 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 1590c393360df059160145e7475754427bfc6680)
Co-authored-by: Christian Heimes <christian@python.org>
| -rw-r--r-- | Lib/test/test_ftplib.py | 5 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Tests/2018-08-16-18-48-47.bpo-34391.ouNfxC.rst | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Lib/test/test_ftplib.py b/Lib/test/test_ftplib.py index 44dd73a..4ff2f71 100644 --- a/Lib/test/test_ftplib.py +++ b/Lib/test/test_ftplib.py @@ -876,18 +876,23 @@ class TestTLS_FTPClass(TestCase): # clear text with self.client.transfercmd('list') as sock: self.assertNotIsInstance(sock, ssl.SSLSocket) + self.assertEqual(sock.recv(1024), LIST_DATA.encode('ascii')) self.assertEqual(self.client.voidresp(), "226 transfer complete") # secured, after PROT P self.client.prot_p() with self.client.transfercmd('list') as sock: 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')) self.assertEqual(self.client.voidresp(), "226 transfer complete") # PROT C is issued, the connection must be in cleartext again self.client.prot_c() with self.client.transfercmd('list') as sock: self.assertNotIsInstance(sock, ssl.SSLSocket) + self.assertEqual(sock.recv(1024), LIST_DATA.encode('ascii')) self.assertEqual(self.client.voidresp(), "226 transfer complete") def test_login(self): 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. |