diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2015-09-07 16:58:23 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2015-09-07 16:58:23 (GMT) |
| commit | ad7b0cda8ac840a7c58d915df98a677bfb8be888 (patch) | |
| tree | 8eb607feb25e902d9a5eb7381696a92eb492ef48 /Lib/test/test_shutil.py | |
| parent | 0ecf462b8e3ae90633a8c5875c15e9e63d896b03 (diff) | |
| download | cpython-ad7b0cda8ac840a7c58d915df98a677bfb8be888.zip cpython-ad7b0cda8ac840a7c58d915df98a677bfb8be888.tar.gz cpython-ad7b0cda8ac840a7c58d915df98a677bfb8be888.tar.bz2 | |
Issue #25018: Fixed testing shutil.make_archive() with relative base_name on
Windows. The test now makes sense on non-Windows. Added similar test for
zip format.
Diffstat (limited to 'Lib/test/test_shutil.py')
| -rw-r--r-- | Lib/test/test_shutil.py | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py index 6143be6..3cc6f2b 100644 --- a/Lib/test/test_shutil.py +++ b/Lib/test/test_shutil.py @@ -379,13 +379,13 @@ class TestShutil(unittest.TestCase): tmpdir2 = self.mkdtemp() # force shutil to create the directory os.rmdir(tmpdir2) - unittest.skipUnless(splitdrive(root_dir)[0] == splitdrive(tmpdir2)[0], - "source and target should be on same drive") + # working with relative paths + work_dir = os.path.dirname(tmpdir2) + rel_base_name = os.path.join(os.path.basename(tmpdir2), 'archive') + base_name = os.path.join(work_dir, rel_base_name) - base_name = os.path.join(tmpdir2, 'archive') - - # working with relative paths to avoid tar warnings - tarball = make_archive(splitdrive(base_name)[1], 'gztar', root_dir, '.') + with support.change_cwd(work_dir): + tarball = make_archive(rel_base_name, 'gztar', root_dir, '.') # check if the compressed tarball was created self.assertEqual(tarball, base_name + '.tar.gz') @@ -397,7 +397,8 @@ class TestShutil(unittest.TestCase): './sub', './sub/file3', './sub2']) # trying an uncompressed one - tarball = make_archive(splitdrive(base_name)[1], 'tar', root_dir, '.') + with support.change_cwd(work_dir): + tarball = make_archive(rel_base_name, 'tar', root_dir, '.') self.assertEqual(tarball, base_name + '.tar') self.assertTrue(os.path.isfile(tarball)) self.assertTrue(tarfile.is_tarfile(tarball)) @@ -465,8 +466,17 @@ class TestShutil(unittest.TestCase): def test_make_zipfile(self): # creating something to zip root_dir, base_dir = self._create_files() - base_name = os.path.join(self.mkdtemp(), 'archive') - res = make_archive(base_name, 'zip', root_dir, 'dist') + + tmpdir2 = self.mkdtemp() + # force shutil to create the directory + os.rmdir(tmpdir2) + # working with relative paths + work_dir = os.path.dirname(tmpdir2) + rel_base_name = os.path.join(os.path.basename(tmpdir2), 'archive') + base_name = os.path.join(work_dir, rel_base_name) + + with support.change_cwd(work_dir): + res = make_archive(rel_base_name, 'zip', root_dir, 'dist') self.assertEqual(res, base_name + '.zip') self.assertTrue(os.path.isfile(res)) |