Merged revisions 61189-61190,61192,61194-61195,61198-61199 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r61189 | brett.cannon | 2008-03-03 01:38:58 +0100 (Mon, 03 Mar 2008) | 5 lines
Refactor test_logging to use unittest. This should finally solve the flakiness
issues.
Thanks to Antoine Pitrou for the patch.
........
r61190 | jeffrey.yasskin | 2008-03-03 02:27:03 +0100 (Mon, 03 Mar 2008) | 3 lines
compile.c always emits END_FINALLY after WITH_CLEANUP, so predict that in
ceval.c. This is worth about a .03-.04us speedup on a simple with block.
........
r61192 | brett.cannon | 2008-03-03 03:41:40 +0100 (Mon, 03 Mar 2008) | 4 lines
Move test_largefile over to using 'with' statements for open files.
Also rename the driver function to test_main() instead of main_test().
........
r61194 | brett.cannon | 2008-03-03 04:24:48 +0100 (Mon, 03 Mar 2008) | 3 lines
Add a note in the main test class' docstring that the order of execution of the
tests is important.
........
r61195 | brett.cannon | 2008-03-03 04:26:43 +0100 (Mon, 03 Mar 2008) | 3 lines
Add a note in the main test class' docstring that the order of execution of the
tests is important.
........
r61198 | brett.cannon | 2008-03-03 05:19:29 +0100 (Mon, 03 Mar 2008) | 4 lines
Add test_main() functions to various tests where it was simple to do. Done so
that regrtest can execute the test_main() directly instead of relying on import
side-effects.
........
r61199 | neal.norwitz | 2008-03-03 05:37:45 +0100 (Mon, 03 Mar 2008) | 1 line
Only DECREF if ret != NULL
........
diff --git a/Lib/test/test_largefile.py b/Lib/test/test_largefile.py
index d1e02ed..4cafe33 100644
--- a/Lib/test/test_largefile.py
+++ b/Lib/test/test_largefile.py
@@ -24,13 +24,17 @@
class TestCase(unittest.TestCase):
"""Test that each file function works as expected for a large
(i.e. > 2GB, do we have to check > 4GB) files.
+
+ NOTE: the order of execution of the test methods is important! test_seek
+ must run first to create the test file. File cleanup must also be handled
+ outside the test instances because of this.
+
"""
def test_seek(self):
if verbose:
print('create large file via seek (may be sparse file) ...')
- f = open(TESTFN, 'wb')
- try:
+ with open(TESTFN, 'wb') as f:
f.write(b'z')
f.seek(0)
f.seek(size)
@@ -39,8 +43,6 @@
if verbose:
print('check file size with os.fstat')
self.assertEqual(os.fstat(f.fileno())[stat.ST_SIZE], size+1)
- finally:
- f.close()
def test_osstat(self):
if verbose:
@@ -50,8 +52,7 @@
def test_seek_read(self):
if verbose:
print('play around with seek() and read() with the built largefile')
- f = open(TESTFN, 'rb')
- try:
+ with open(TESTFN, 'rb') as f:
self.assertEqual(f.tell(), 0)
self.assertEqual(f.read(1), b'z')
self.assertEqual(f.tell(), 1)
@@ -80,14 +81,11 @@
f.seek(-size-1, 1)
self.assertEqual(f.read(1), b'z')
self.assertEqual(f.tell(), 1)
- finally:
- f.close()
def test_lseek(self):
if verbose:
print('play around with os.lseek() with the built largefile')
- f = open(TESTFN, 'rb')
- try:
+ with open(TESTFN, 'rb') as f:
self.assertEqual(os.lseek(f.fileno(), 0, 0), 0)
self.assertEqual(os.lseek(f.fileno(), 42, 0), 42)
self.assertEqual(os.lseek(f.fileno(), 42, 1), 84)
@@ -98,18 +96,15 @@
self.assertEqual(os.lseek(f.fileno(), size, 0), size)
# the 'a' that was written at the end of file above
self.assertEqual(f.read(1), b'a')
- finally:
- f.close()
def test_truncate(self):
if verbose:
print('try truncate')
- f = open(TESTFN, 'r+b')
- # this is already decided before start running the test suite
- # but we do it anyway for extra protection
- if not hasattr(f, 'truncate'):
- raise TestSkipped("open().truncate() not available on this system")
- try:
+ with open(TESTFN, 'r+b') as f:
+ # this is already decided before start running the test suite
+ # but we do it anyway for extra protection
+ if not hasattr(f, 'truncate'):
+ raise TestSkipped("open().truncate() not available on this system")
f.seek(0, 2)
# else we've lost track of the true size
self.assertEqual(f.tell(), size+1)
@@ -134,10 +129,8 @@
f.truncate(1)
self.assertEqual(f.tell(), 0) # else pointer moved
self.assertEqual(len(f.read()), 1) # else wasn't truncated
- finally:
- f.close()
-def main_test():
+def test_main():
# On Windows and Mac OSX this test comsumes large resources; It
# takes a long time to build the >2GB file and takes >2GB of disk
# space therefore the resource must be enabled to run this test.
@@ -168,13 +161,14 @@
suite.addTest(TestCase('test_osstat'))
suite.addTest(TestCase('test_seek_read'))
suite.addTest(TestCase('test_lseek'))
- f = open(TESTFN, 'w')
- if hasattr(f, 'truncate'):
- suite.addTest(TestCase('test_truncate'))
- f.close()
+ with open(TESTFN, 'w') as f:
+ if hasattr(f, 'truncate'):
+ suite.addTest(TestCase('test_truncate'))
unlink(TESTFN)
- run_unittest(suite)
- unlink(TESTFN)
+ try:
+ run_unittest(suite)
+ finally:
+ unlink(TESTFN)
if __name__ == '__main__':
- main_test()
+ test_main()