summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2013-08-16 17:35:02 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2013-08-16 17:35:02 (GMT)
commitac601601ced9e06b2132781b7c4a4551ab93758a (patch)
tree01cfc9a6d5f46f330b8a9110026a6c76d8d6894a
parentba69008bd0999d8fd088b8e66caf019baf73c576 (diff)
downloadcpython-ac601601ced9e06b2132781b7c4a4551ab93758a.zip
cpython-ac601601ced9e06b2132781b7c4a4551ab93758a.tar.gz
cpython-ac601601ced9e06b2132781b7c4a4551ab93758a.tar.bz2
Issue #1666318: Add a test that shutil.copytree() retains directory permissions.
Patch by Catherine Devlin.
-rw-r--r--Lib/test/test_shutil.py26
-rw-r--r--Misc/NEWS3
2 files changed, 29 insertions, 0 deletions
diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py
index acaffdd..9af7da7 100644
--- a/Lib/test/test_shutil.py
+++ b/Lib/test/test_shutil.py
@@ -726,6 +726,32 @@ class TestShutil(unittest.TestCase):
shutil.rmtree(src_dir)
shutil.rmtree(os.path.dirname(dst_dir))
+ def test_copytree_retains_permissions(self):
+ tmp_dir = tempfile.mkdtemp()
+ src_dir = os.path.join(tmp_dir, 'source')
+ os.mkdir(src_dir)
+ dst_dir = os.path.join(tmp_dir, 'destination')
+ self.addCleanup(shutil.rmtree, tmp_dir)
+
+ os.chmod(src_dir, 0o777)
+ write_file((src_dir, 'permissive.txt'), '123')
+ os.chmod(os.path.join(src_dir, 'permissive.txt'), 0o777)
+ write_file((src_dir, 'restrictive.txt'), '456')
+ os.chmod(os.path.join(src_dir, 'restrictive.txt'), 0o600)
+ restrictive_subdir = tempfile.mkdtemp(dir=src_dir)
+ os.chmod(restrictive_subdir, 0o600)
+
+ shutil.copytree(src_dir, dst_dir)
+ self.assertEquals(os.stat(src_dir).st_mode, os.stat(dst_dir).st_mode)
+ self.assertEquals(os.stat(os.path.join(src_dir, 'permissive.txt')).st_mode,
+ os.stat(os.path.join(dst_dir, 'permissive.txt')).st_mode)
+ self.assertEquals(os.stat(os.path.join(src_dir, 'restrictive.txt')).st_mode,
+ os.stat(os.path.join(dst_dir, 'restrictive.txt')).st_mode)
+ restrictive_subdir_dst = os.path.join(dst_dir,
+ os.path.split(restrictive_subdir)[1])
+ self.assertEquals(os.stat(restrictive_subdir).st_mode,
+ os.stat(restrictive_subdir_dst).st_mode)
+
@unittest.skipUnless(hasattr(os, 'link'), 'requires os.link')
def test_dont_copy_file_onto_link_to_itself(self):
# Temporarily disable test on Windows.
diff --git a/Misc/NEWS b/Misc/NEWS
index 0dd2d10..f7c5e37 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -258,6 +258,9 @@ IDLE
Tests
-----
+- Issue #1666318: Add a test that shutil.copytree() retains directory
+ permissions. Patch by Catherine Devlin.
+
- Issue #18357: add tests for dictview set difference.
Patch by Fraser Tweedale.