Commit 2c52b0b8 authored by Serhiy Storchaka's avatar Serhiy Storchaka

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

the path of the directory for temporary files contains symlinks.
parent 0e951cad
......@@ -971,9 +971,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
......@@ -1061,9 +1061,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')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment