summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-07-21 16:50:52 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-07-21 16:50:52 (GMT)
commitea435512eaa8dd3f2a1e1c30e874486d2073038c (patch)
treeded7065b93aece873a0150dbbb226221da1fc712 /Lib/test
parentf247101a4c4370af880a7faa08dad13872a6ba6c (diff)
downloadcpython-ea435512eaa8dd3f2a1e1c30e874486d2073038c.zip
cpython-ea435512eaa8dd3f2a1e1c30e874486d2073038c.tar.gz
cpython-ea435512eaa8dd3f2a1e1c30e874486d2073038c.tar.bz2
Merged revisions 83031 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint ................ r83031 | antoine.pitrou | 2010-07-21 18:47:28 +0200 (mer., 21 juil. 2010) | 11 lines Merged revisions 83030 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r83030 | antoine.pitrou | 2010-07-21 18:41:31 +0200 (mer., 21 juil. 2010) | 5 lines Issue #5395: check that array.fromfile() re-raises an IOError instead of replacing it with EOFError. (this is only an added test, but 2.x will get a fix too) ........ ................
Diffstat (limited to 'Lib/test')
-rwxr-xr-xLib/test/test_array.py11
1 files changed, 11 insertions, 0 deletions
diff --git a/Lib/test/test_array.py b/Lib/test/test_array.py
index 206042f..4c870d7 100755
--- a/Lib/test/test_array.py
+++ b/Lib/test/test_array.py
@@ -188,6 +188,17 @@ class BaseTest(unittest.TestCase):
f.close()
test_support.unlink(test_support.TESTFN)
+ def test_fromfile_ioerror(self):
+ # Issue #5395: Check if fromfile raises a proper IOError
+ # instead of EOFError.
+ a = array.array(self.typecode)
+ f = open(test_support.TESTFN, 'wb')
+ try:
+ self.assertRaises(IOError, a.fromfile, f, len(self.example))
+ finally:
+ f.close()
+ test_support.unlink(test_support.TESTFN)
+
def test_tofromlist(self):
a = array.array(self.typecode, 2*self.example)
b = array.array(self.typecode)