summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_largefile.py
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-01-31 23:20:26 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-01-31 23:20:26 (GMT)
commit66f9fea782d330b28fe142ac4e58faff8a6f42d1 (patch)
tree664127f167fb8d906cf7f7de7d1e1557fea0e647 /Lib/test/test_largefile.py
parent1665a8d9313660ffdcf3eda3eb1e1cc4eefcacee (diff)
downloadcpython-66f9fea782d330b28fe142ac4e58faff8a6f42d1.zip
cpython-66f9fea782d330b28fe142ac4e58faff8a6f42d1.tar.gz
cpython-66f9fea782d330b28fe142ac4e58faff8a6f42d1.tar.bz2
Merged revisions 77895-77896 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r77895 | antoine.pitrou | 2010-01-31 23:47:27 +0100 (dim., 31 janv. 2010) | 12 lines Merged revisions 77890 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r77890 | antoine.pitrou | 2010-01-31 23:26:04 +0100 (dim., 31 janv. 2010) | 7 lines - Issue #6939: Fix file I/O objects in the `io` module to keep the original file position when calling `truncate()`. It would previously change the file position to the given argument, which goes against the tradition of ftruncate() and other truncation APIs. Patch by Pascal Chambon. ........ ................ r77896 | antoine.pitrou | 2010-02-01 00:12:29 +0100 (lun., 01 févr. 2010) | 3 lines r77895 broke doctest. ................
Diffstat (limited to 'Lib/test/test_largefile.py')
-rw-r--r--Lib/test/test_largefile.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_largefile.py b/Lib/test/test_largefile.py
index 7fd3e0e..1c6297a 100644
--- a/Lib/test/test_largefile.py
+++ b/Lib/test/test_largefile.py
@@ -122,14 +122,14 @@ class LargeFileTest(unittest.TestCase):
newsize -= 1
f.seek(42)
f.truncate(newsize)
- self.assertEqual(f.tell(), newsize) # else wasn't truncated
+ self.assertEqual(f.tell(), 42)
f.seek(0, 2)
self.assertEqual(f.tell(), newsize)
# XXX truncate(larger than true size) is ill-defined
# across platform; cut it waaaaay back
f.seek(0)
f.truncate(1)
- self.assertEqual(f.tell(), 1) # else pointer moved
+ self.assertEqual(f.tell(), 0) # else pointer moved
f.seek(0)
self.assertEqual(len(f.read()), 1) # else wasn't truncated