[Python-checkins] cpython (2.7): Fixed tests for shutil.make_archive() with relative base_name in the case when

Tue Sep 8 09:01:20 CEST 2015

https://hg.python.org/cpython/rev/ab1dc73fe8b5
changeset: 97776:ab1dc73fe8b5
branch: 2.7
parent: 97772:1c5a171e7a13
user: Serhiy Storchaka <storchaka at gmail.com>
date: Tue Sep 08 09:59:02 2015 +0300
summary:
 Fixed tests for shutil.make_archive() with relative base_name in the case when
the path of the directory for temporary files contains symlinks.
files:
 Lib/test/test_shutil.py | 4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py
--- a/Lib/test/test_shutil.py
+++ b/Lib/test/test_shutil.py
@@ -382,9 +382,9 @@
 # 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
@@ -473,9 +473,9 @@
 # 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')
-- 
Repository URL: https://hg.python.org/cpython
