Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

(Merge 3.4) Issue #21440: test_zipfile: replace last direct calls to 

os.remove() with support.unlink()
This commit is contained in:
Victor Stinner 2014-09-04 00:51:25 +02:00
parent cde4517112 88b215e20f
commit 150b06fa19
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Lib/test/test_zipfile.py
View File

@ -717,7 +717,7 @@ class PyZipFileTests(unittest.TestCase):
with open(TESTFN, 'w') as f: with open(TESTFN, 'w') as f:
f.write('most definitely not a python file') f.write('most definitely not a python file')
self.assertRaises(RuntimeError, zipfp.writepy, TESTFN) self.assertRaises(RuntimeError, zipfp.writepy, TESTFN)
os.remove(TESTFN) unlink(TESTFN)
def test_write_pyfile_bad_syntax(self): def test_write_pyfile_bad_syntax(self):
os.mkdir(TESTFN2) os.mkdir(TESTFN2)
@ -763,7 +763,7 @@ class ExtractTests(unittest.TestCase):
with open(writtenfile, "rb") as f: with open(writtenfile, "rb") as f:
self.assertEqual(fdata.encode(), f.read()) self.assertEqual(fdata.encode(), f.read())
os.remove(writtenfile) unlink(writtenfile)
# remove the test file subdirectories # remove the test file subdirectories
rmtree(os.path.join(os.getcwd(), 'ziptest2dir')) rmtree(os.path.join(os.getcwd(), 'ziptest2dir'))
@ -781,7 +781,7 @@ class ExtractTests(unittest.TestCase):
with open(outfile, "rb") as f: with open(outfile, "rb") as f:
self.assertEqual(fdata.encode(), f.read()) self.assertEqual(fdata.encode(), f.read())
os.remove(outfile) unlink(outfile)
# remove the test file subdirectories # remove the test file subdirectories
rmtree(os.path.join(os.getcwd(), 'ziptest2dir')) rmtree(os.path.join(os.getcwd(), 'ziptest2dir'))
@ -887,7 +887,7 @@ class ExtractTests(unittest.TestCase):
self.check_file(correctfile, content) self.check_file(correctfile, content)
rmtree(fixedname.split('/')[0]) rmtree(fixedname.split('/')[0])
os.remove(TESTFN2) unlink(TESTFN2)
class OtherTests(unittest.TestCase): class OtherTests(unittest.TestCase):
@ -1755,7 +1755,7 @@ class AbstractUniversalNewlineTests:
def tearDown(self): def tearDown(self):
for sep, fn in self.arcfiles.items(): for sep, fn in self.arcfiles.items():
os.remove(fn) unlink(fn)
unlink(TESTFN) unlink(TESTFN)
unlink(TESTFN2) unlink(TESTFN2)