languages/cpython
languages/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2024-09-16 05:19:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

New test code failed to close the file. This caused

Browse source 
test_file to fail on Windows in reality (can't delete
a still-open file), but a new bare "except:" hid that
test_file failed on Windows, and leaving behind the
still-open TESTFN caused a cascade of bogus failures
in later tests.

So, close the file, and stop hiding failure to unlink.
This commit is contained in:
Tim Peters 2006-02-14 17:41:18 +00:00
parent 967aa8b349
commit cffcfed126
1 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
Lib/test/test_file.py
View file

@ -323,18 +323,17 @@ def bug801631():
"failed. Got %r, expected %r" % (line, testline))
# Reading after iteration hit EOF shouldn't hurt either
f = open(TESTFN)
for line in f:
pass
try:
f.readline()
f.readinto(buf)
f.read()
f.readlines()
except ValueError:
raise TestFailed("read* failed after next() consumed file")
for line in f:
pass
try:
f.readline()
f.readinto(buf)
f.read()
f.readlines()
except ValueError:
raise TestFailed("read* failed after next() consumed file")
finally:
f.close()
finally:
# Bare 'except' so as not to mask errors in the test
try:
os.unlink(TESTFN)
except:
pass
os.unlink(TESTFN)