summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_os.py
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-01-19 17:53:36 (GMT)
committerBenjamin Peterson <benjamin@python.org>2009-01-19 17:53:36 (GMT)
commit9053d7548592f4a583d99595d9bbf0050e920da4 (patch)
tree8935fcb38e555b1b3397a8d5843377220726341c /Lib/test/test_os.py
parent6214edd1bbf8aece44215b6a47fb2be4df73d42e (diff)
downloadcpython-9053d7548592f4a583d99595d9bbf0050e920da4.zip
cpython-9053d7548592f4a583d99595d9bbf0050e920da4.tar.gz
cpython-9053d7548592f4a583d99595d9bbf0050e920da4.tar.bz2
Merged revisions 68763,68773 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r68763 | kristjan.jonsson | 2009-01-19 07:10:27 -0600 (Mon, 19 Jan 2009) | 2 lines Issue 4957 Let os.ftruncate raise OSError like documented. ........ r68773 | benjamin.peterson | 2009-01-19 09:51:27 -0600 (Mon, 19 Jan 2009) | 1 line simplify code ........
Diffstat (limited to 'Lib/test/test_os.py')
-rw-r--r--Lib/test/test_os.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index f7471e5..a2e611f 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -624,10 +624,9 @@ class TestInvalidFD(unittest.TestCase):
if hasattr(os, "fpathconf"):
self.assertRaises(OSError, os.fpathconf, 10, "PC_NAME_MAX")
- #this is a weird one, it raises IOError unlike the others
def test_ftruncate(self):
if hasattr(os, "ftruncate"):
- self.assertRaises(IOError, os.ftruncate, 10, 0)
+ self.assertRaises(OSError, os.ftruncate, 10, 0)
def test_lseek(self):
if hasattr(os, "lseek"):