From 5558d4f2f89b86bb0aab35fff01c2b51f1013f33 Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Tue, 8 Sep 2015 09:59:02 +0300
Subject: Fixed tests for shutil.make_archive() with relative base_name in the
case when the path of the directory for temporary files contains symlinks.
---
Lib/test/test_shutil.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py
index 04738d3..5b4e7e7 100644
--- a/Lib/test/test_shutil.py
+++ b/Lib/test/test_shutil.py
@@ -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')
--
cgit v0.12