mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 18:51:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 21

Issue #21440: Backport changeset 4ebf97299b18 to branch 3.4, use

Browse source 
support.rmtree() and support.unlink() in test_zipfile & test_tarfile
This commit is contained in:
Victor Stinner 2014-09-04 00:49:01 +02:00
parent 19c899c1b1
commit 57004c696a
2 changed files with 30 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Lib/test/test_zipfile.py
View file

@ -3,7 +3,6 @@ import os
import sys
import importlib.util
import time
import shutil
import struct
import zipfile
import unittest
@ -12,7 +11,7 @@ import unittest
from tempfile import TemporaryFile
from random import randint, random, getrandbits
from test.support import (TESTFN, findfile, unlink,
from test.support import (TESTFN, findfile, unlink, rmtree,
requires_zlib, requires_bz2, requires_lzma,
captured_stdout, check_warnings)
@ -691,7 +690,7 @@ class PyZipFileTests(unittest.TestCase):
self.assertNotIn('mod2.txt', names)
finally:
shutil.rmtree(TESTFN2)
rmtree(TESTFN2)
def test_write_python_directory_filtered(self):
os.mkdir(TESTFN2)
@ -711,7 +710,7 @@ class PyZipFileTests(unittest.TestCase):
self.assertNotIn('mod2.py', names)
finally:
shutil.rmtree(TESTFN2)
rmtree(TESTFN2)
def test_write_non_pyfile(self):
with TemporaryFile() as t, zipfile.PyZipFile(t, "w") as zipfp:
@ -741,7 +740,7 @@ class PyZipFileTests(unittest.TestCase):
self.assertNotIn('mod1.pyo', names)
finally:
shutil.rmtree(TESTFN2)
rmtree(TESTFN2)
class ExtractTests(unittest.TestCase):
@ -767,7 +766,7 @@ class ExtractTests(unittest.TestCase):
os.remove(writtenfile)
# remove the test file subdirectories
shutil.rmtree(os.path.join(os.getcwd(), 'ziptest2dir'))
rmtree(os.path.join(os.getcwd(), 'ziptest2dir'))
def test_extract_all(self):
with zipfile.ZipFile(TESTFN2, "w", zipfile.ZIP_STORED) as zipfp:
@ -785,7 +784,7 @@ class ExtractTests(unittest.TestCase):
os.remove(outfile)
# remove the test file subdirectories
shutil.rmtree(os.path.join(os.getcwd(), 'ziptest2dir'))
rmtree(os.path.join(os.getcwd(), 'ziptest2dir'))
def check_file(self, filename, content):
self.assertTrue(os.path.isfile(filename))
@ -867,12 +866,12 @@ class ExtractTests(unittest.TestCase):
msg='extract %r: %r != %r' %
(arcname, writtenfile, correctfile))
self.check_file(correctfile, content)
shutil.rmtree('target')
rmtree('target')
with zipfile.ZipFile(TESTFN2, 'r') as zipfp:
zipfp.extractall(targetpath)
self.check_file(correctfile, content)
shutil.rmtree('target')
rmtree('target')
correctfile = os.path.join(os.getcwd(), *fixedname.split('/'))
@ -881,12 +880,12 @@ class ExtractTests(unittest.TestCase):
self.assertEqual(writtenfile, correctfile,
msg="extract %r" % arcname)
self.check_file(correctfile, content)
shutil.rmtree(fixedname.split('/')[0])
rmtree(fixedname.split('/')[0])
with zipfile.ZipFile(TESTFN2, 'r') as zipfp:
zipfp.extractall()
self.check_file(correctfile, content)
shutil.rmtree(fixedname.split('/')[0])
rmtree(fixedname.split('/')[0])
os.remove(TESTFN2)
@ -1643,7 +1642,7 @@ class TestWithDirectory(unittest.TestCase):
self.assertTrue(zipf.filelist[0].filename.endswith("x/"))
def tearDown(self):
shutil.rmtree(TESTFN2)
rmtree(TESTFN2)
if os.path.exists(TESTFN):
unlink(TESTFN)