Force file mode when testing permission

Signed-off-by: Uilian Ries <uilianries@gmail.com>

Author: uilianries

patch_ng.py

@@ -31,7 +31,7 @@
 from __future__ import print_function
 
 __author__ = "Conan.io <info@conan.io>"
-__version__ = "1.17.3"
+__version__ = "1.17.4"
 __license__ = "MIT"
 __url__ = "https://github.com/conan-io/python-patch"
 
@@ -1107,13 +1107,13 @@ def apply(self, strip=0, root=None, fuzz=False):
           shutil.move(filenamen, backupname)
           if self.write_hunks(backupname if filenameo == filenamen else filenameo, filenamen, p.hunks):
             info("successfully patched %d/%d:\t %s" % (i+1, total, filenamen))
-            os.chmod(backupname, stat.S_IWRITE)
+            os.chmod(backupname, stat.S_IWUSR | stat.S_IWGRP | stat.S_IWOTH)
             os.unlink(backupname)
             if new == b'/dev/null':
               # check that filename is of size 0 and delete it.
               if os.path.getsize(filenamen) > 0:
                 warning("expected patched file to be empty as it's marked as deletion:\t %s" % filenamen)
-              os.chmod(filenamen, stat.S_IWRITE)
+              os.chmod(backupname, stat.S_IWUSR | stat.S_IWGRP | stat.S_IWOTH)
               os.unlink(filenamen)
           else:
             errors += 1

tests/run_tests.py

@@ -37,7 +37,8 @@
 import shutil
 import unittest
 import copy
-from os import listdir
+import stat
+from os import listdir, chmod
 from os.path import abspath, dirname, exists, join, isdir, isfile
 from tempfile import mkdtemp
 try:
@@ -171,9 +172,7 @@ def _run_test(self, testname):
         self._assert_dirs_equal(join(basepath, "[result]"),
                                 tmpdir,
                                 ignore=["%s.patch" % testname, ".svn", ".gitkeep", "[result]"])
-
-
-      shutil.rmtree(tmpdir)
+      remove_tree_force(tmpdir)
       return 0
 
 
@@ -362,7 +361,7 @@ def setUp(self):
 
     def tearDown(self):
         os.chdir(self.save_cwd)
-        shutil.rmtree(self.tmpdir)
+        remove_tree_force(self.tmpdir)
 
     def tmpcopy(self, filenames):
         """copy file(s) from test_dir to self.tmpdir"""
@@ -447,10 +446,15 @@ def test_fuzzy_patch_after(self):
         self.assertFalse(pto.apply(root=treeroot, fuzz=False))
 
     def test_unlink_backup_windows(self):
+        """ Apply patch to a read-only file and don't change its filemode
+        """
         treeroot = join(self.tmpdir, 'rootparent')
         shutil.copytree(join(TESTS, '11permission'), treeroot)
-        pto = patch_ng.fromfile(join(TESTS, '11permission/11permission.patch'))
+        pto = patch_ng.fromfile(join(TESTS, '11permission', '11permission.patch'))
+        some_file = join(TESTS, '11permission', 'some_file')
+        chmod(some_file, stat.S_IRUSR | stat.S_IRGRP | stat.S_IROTH)
         self.assertTrue(pto.apply(root=treeroot))
+        self.assertTrue(os.stat(some_file).st_mode, stat.S_IRUSR | stat.S_IRGRP | stat.S_IROTH)
 
 
 class TestHelpers(unittest.TestCase):
@@ -484,6 +488,14 @@ def test_pathstrip(self):
         self.assertEqual(patch_ng.pathstrip(b'path/name.diff', 1), b'name.diff')
         self.assertEqual(patch_ng.pathstrip(b'path/name.diff', 0), b'path/name.diff')
 
+def remove_tree_force(folder):
+    for root, dirs, files in os.walk(folder):
+        for it in dirs:
+            chmod(os.path.join(root, it), stat.S_IWUSR | stat.S_IWGRP | stat.S_IWOTH)
+        for it in files:
+            chmod(os.path.join(root, it), stat.S_IWUSR | stat.S_IWGRP | stat.S_IWOTH)
+    shutil.rmtree(folder)
+
 # ----------------------------------------------------------------------------
 
 if __name__ == '__main__':