mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 10:50:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Explicitly test archive name in shutil.make_archive() tests to expose failure

Browse source 
details in issue25018.
This commit is contained in:
Serhiy Storchaka 2015-09-07 13:55:25 +03:00
parent b41eadab43
commit a091a8221e
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Lib/test/test_shutil.py
View file

@ -974,10 +974,10 @@ class TestShutil(unittest.TestCase):
base_name = os.path.join(tmpdir2, 'archive') base_name = os.path.join(tmpdir2, 'archive')
# working with relative paths to avoid tar warnings # working with relative paths to avoid tar warnings
make_archive(splitdrive(base_name)[1], 'gztar', root_dir, '.') tarball = make_archive(splitdrive(base_name)[1], 'gztar', root_dir, '.')
# check if the compressed tarball was created # check if the compressed tarball was created
tarball = base_name + '.tar.gz' self.assertEqual(tarball, base_name + '.tar.gz')
self.assertTrue(os.path.isfile(tarball)) self.assertTrue(os.path.isfile(tarball))
self.assertTrue(tarfile.is_tarfile(tarball)) self.assertTrue(tarfile.is_tarfile(tarball))
with tarfile.open(tarball, 'r:gz') as tf: with tarfile.open(tarball, 'r:gz') as tf:
@ -986,9 +986,8 @@ class TestShutil(unittest.TestCase):
'./file1', './file2', './sub/file3']) './file1', './file2', './sub/file3'])
# trying an uncompressed one # trying an uncompressed one
base_name = os.path.join(tmpdir2, 'archive') tarball = make_archive(splitdrive(base_name)[1], 'tar', root_dir, '.')
make_archive(splitdrive(base_name)[1], 'tar', root_dir, '.') self.assertEqual(tarball, base_name + '.tar')
tarball = base_name + '.tar'
self.assertTrue(os.path.isfile(tarball)) self.assertTrue(os.path.isfile(tarball))
self.assertTrue(tarfile.is_tarfile(tarball)) self.assertTrue(tarfile.is_tarfile(tarball))
with tarfile.open(tarball, 'r') as tf: with tarfile.open(tarball, 'r') as tf:
@ -1022,10 +1021,10 @@ class TestShutil(unittest.TestCase):
def test_tarfile_vs_tar(self): def test_tarfile_vs_tar(self):
root_dir, base_dir = self._create_files() root_dir, base_dir = self._create_files()
base_name = os.path.join(self.mkdtemp(), 'archive') base_name = os.path.join(self.mkdtemp(), 'archive')
make_archive(base_name, 'gztar', root_dir, base_dir) tarball = make_archive(base_name, 'gztar', root_dir, base_dir)
# check if the compressed tarball was created # check if the compressed tarball was created
tarball = base_name + '.tar.gz' self.assertEqual(tarball, base_name + '.tar.gz')
self.assertTrue(os.path.isfile(tarball)) self.assertTrue(os.path.isfile(tarball))
# now create another tarball using `tar` # now create another tarball using `tar`
@ -1039,13 +1038,14 @@ class TestShutil(unittest.TestCase):
self.assertEqual(self._tarinfo(tarball), self._tarinfo(tarball2)) self.assertEqual(self._tarinfo(tarball), self._tarinfo(tarball2))
# trying an uncompressed one # trying an uncompressed one
make_archive(base_name, 'tar', root_dir, base_dir) tarball = make_archive(base_name, 'tar', root_dir, base_dir)
tarball = base_name + '.tar' self.assertEqual(tarball, base_name + '.tar')
self.assertTrue(os.path.isfile(tarball)) self.assertTrue(os.path.isfile(tarball))
# now for a dry_run # now for a dry_run
make_archive(base_name, 'tar', root_dir, base_dir, dry_run=True) tarball = make_archive(base_name, 'tar', root_dir, base_dir,
tarball = base_name + '.tar' dry_run=True)
self.assertEqual(tarball, base_name + '.tar')
self.assertTrue(os.path.isfile(tarball)) self.assertTrue(os.path.isfile(tarball))
@requires_zlib @requires_zlib