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 c1de0c1efb1b39861e26fa7e7ae1e4cb286a99e6..440c80212b68a8ad7e153db568f574ff6ffeb342 100644 (file)
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -125,25 +125,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()
-        try:
-            os.read(fd, 0)
-        except OSError, e:
-            self.assertEqual(e.errno, errno.EBADF)
-        else:
-            self.fail("OSError wasn't raised")
-
 
 class NetworkedTests(unittest.TestCase):
 
@@ -177,6 +158,30 @@ class NetworkedTests(unittest.TestCase):
         finally:
             s.close()
 
+    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).
+        if os.name == "nt":
+            if test_support.verbose:
+                print "Skipped: can't use a socket as a file under Windows"
+            return
+        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, e:
+            self.assertEqual(e.errno, errno.EBADF)
+        else:
+            self.fail("OSError wasn't raised")
 
     def testNonBlockingHandshake(self):
         s = socket.socket(socket.AF_INET)