summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_fileio.py
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-01-19 21:00:09 (GMT)
committerBenjamin Peterson <benjamin@python.org>2009-01-19 21:00:09 (GMT)
commit7522c748b1548c14dcc88a4857ab963d7fe66e84 (patch)
treea781c14fe27532678bbbaeafc79e0d7fe2bb01ba /Lib/test/test_fileio.py
parent9053d7548592f4a583d99595d9bbf0050e920da4 (diff)
downloadcpython-7522c748b1548c14dcc88a4857ab963d7fe66e84.zip
cpython-7522c748b1548c14dcc88a4857ab963d7fe66e84.tar.gz
cpython-7522c748b1548c14dcc88a4857ab963d7fe66e84.tar.bz2
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 ........
Diffstat (limited to 'Lib/test/test_fileio.py')
-rw-r--r--Lib/test/test_fileio.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/Lib/test/test_fileio.py b/Lib/test/test_fileio.py
index 69aa3fd..497914f 100644
--- a/Lib/test/test_fileio.py
+++ b/Lib/test/test_fileio.py
@@ -6,7 +6,8 @@ import unittest
from array import array
from weakref import proxy
-from test.support import TESTFN, findfile, check_warnings, run_unittest
+from test.support import (TESTFN, findfile, check_warnings, run_unittest,
+ make_bad_fd)
from collections import UserList
import _fileio
@@ -177,7 +178,7 @@ class OtherFileTests(unittest.TestCase):
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