[Python-checkins] r80430 - in python/branches/release31-maint: Lib/test/test_ssl.py

antoine.pitrou python-checkins at python.org
Sat Apr 24 01:33:50 CEST 2010


Author: antoine.pitrou
Date: Sat Apr 24 01:33:50 2010
New Revision: 80430

Log:
Merged revisions 80429 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r80429 | antoine.pitrou | 2010-04-24 01:31:47 +0200 (sam., 24 avril 2010) | 13 lines
  
  Note: I'm just merging in the additional test.
  
  
  Merged revisions 80428 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ........
    r80428 | antoine.pitrou | 2010-04-24 01:25:45 +0200 (sam., 24 avril 2010) | 4 lines
    
    Issue #5238: Calling makefile() on an SSL object would prevent the
    underlying socket from being closed until all objects get truely destroyed.
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/test/test_ssl.py

Modified: python/branches/release31-maint/Lib/test/test_ssl.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_ssl.py	(original)
+++ python/branches/release31-maint/Lib/test/test_ssl.py	Sat Apr 24 01:33:50 2010
@@ -8,7 +8,9 @@
 import errno
 import subprocess
 import time
+import gc
 import os
+import errno
 import pprint
 import urllib.parse, urllib.request
 import shutil
@@ -108,6 +110,25 @@
         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):
 
     def testConnect(self):


More information about the Python-checkins mailing list