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

Fixed tests for shutil.make_archive() with relative base_name in the case when 

the path of the directory for temporary files contains symlinks.
This commit is contained in:
Serhiy Storchaka 2015-09-08 10:00:43 +03:00
parent 4da050a276 050a143a3f
commit 8a6023d05f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/test/test_shutil.py
View File

@ -977,9 +977,9 @@ class TestShutil(unittest.TestCase):
# 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):
base_name = os.path.abspath(rel_base_name)
tarball = make_archive(rel_base_name, 'gztar', root_dir, '.')
# check if the compressed tarball was created
@ -1067,9 +1067,9 @@ class TestShutil(unittest.TestCase):
# 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):
base_name = os.path.abspath(rel_base_name)
res = make_archive(rel_base_name, 'zip', root_dir, base_dir)
self.assertEqual(res, base_name + '.zip')