diff options
| -rw-r--r-- | Lib/test/test_ssl.py | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index 53b71b9..2b1ba8a 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -151,22 +151,6 @@ class BasicTests(unittest.TestCase): del ss self.assertEqual(wr(), None) - def test_makefile_close(self): - # Issue #5238: creating a file-like object with makefile() shouldn't - # leak the underlying file descriptor. - ss = ssl.wrap_socket(socket.socket(socket.AF_INET)) - fd = ss.fileno() - f = ss.makefile() - f.close() - # The fd is still open - os.read(fd, 0) - # Closing the SSL socket should close the fd too - ss.close() - gc.collect() - with self.assertRaises(OSError) as e: - os.read(fd, 0) - self.assertEqual(e.exception.errno, errno.EBADF) - class NetworkedTests(unittest.TestCase): @@ -200,6 +184,25 @@ class NetworkedTests(unittest.TestCase): finally: s.close() + @unittest.skipIf(os.name == "nt", "Can't use a socket as a file under Windows") + def test_makefile_close(self): + # Issue #5238: creating a file-like object with makefile() shouldn't + # delay closing the underlying "real socket" (here tested with its + # file descriptor, hence skipping the test under Windows). + ss = ssl.wrap_socket(socket.socket(socket.AF_INET)) + ss.connect(("svn.python.org", 443)) + fd = ss.fileno() + f = ss.makefile() + f.close() + # The fd is still open + os.read(fd, 0) + # Closing the SSL socket should close the fd too + ss.close() + gc.collect() + with self.assertRaises(OSError) as e: + os.read(fd, 0) + self.assertEqual(e.exception.errno, errno.EBADF) + def testNonBlockingHandshake(self): s = socket.socket(socket.AF_INET) s.connect(("svn.python.org", 443)) |