Merged revisions 80436 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r80436 | antoine.pitrou | 2010-04-24 13:13:53 +0200 (sam., 24 avril 2010) | 11 lines
Merged revisions 80434 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r80434 | antoine.pitrou | 2010-04-24 12:43:57 +0200 (sam., 24 avril 2010) | 5 lines
Make test_makefile_close a networked test (can't read() from a non-connected
socket under OS X), and skip it under Windows (where sockets can't be read()
from using their fds).
........
................
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index 19e7cb8..30923e7 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -110,24 +110,6 @@
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()
- try:
- os.read(fd, 0)
- except OSError as e:
- self.assertEqual(e.errno, errno.EBADF)
- else:
- self.fail("OSError wasn't raised")
class NetworkedTests(unittest.TestCase):
@@ -161,6 +143,28 @@
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()
+ try:
+ os.read(fd, 0)
+ except OSError as e:
+ self.assertEqual(e.errno, errno.EBADF)
+ else:
+ self.fail("OSError wasn't raised")
+
def testNonBlockingHandshake(self):
s = socket.socket(socket.AF_INET)
s.connect(("svn.python.org", 443))