Merged revisions 68779 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r68779 | benjamin.peterson | 2009-01-19 11:37:42 -0600 (Mon, 19 Jan 2009) | 1 line
make bad file descriptor tests more robust
........
diff --git a/Lib/test/test_fileio.py b/Lib/test/test_fileio.py
index c089608..04c7b45 100644
--- a/Lib/test/test_fileio.py
+++ b/Lib/test/test_fileio.py
@@ -7,7 +7,8 @@
from array import array
from weakref import proxy
-from test.test_support import TESTFN, findfile, check_warnings, run_unittest
+from test.test_support import (TESTFN, findfile, check_warnings, run_unittest,
+ make_bad_fd)
from UserList import UserList
import _fileio
@@ -178,7 +179,7 @@
def testInvalidFd(self):
self.assertRaises(ValueError, _fileio._FileIO, -10)
- self.assertRaises(OSError, _fileio._FileIO, 10)
+ self.assertRaises(OSError, _fileio._FileIO, make_bad_fd())
def testBadModeArgument(self):
# verify that we get a sensible error message for bad mode argument