traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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).
  ........
................
This commit is contained in:
Antoine Pitrou 2010-04-24 11:17:37 +00:00
parent 3b9b9bab3d
commit fe0f117ce6
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Lib/test/test_ssl.py
View File

@ -110,24 +110,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 as e:
self.assertEqual(e.errno, errno.EBADF)
else:
self.fail("OSError wasn't raised")
class NetworkedTests(unittest.TestCase):
@ -161,6 +143,28 @@ 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()
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))