From: Michael Albinus <michael.albinus@gmx.de>
Date: Tue, 14 Nov 2017 09:38:41 +0000 (+0100)
Subject: Fix Bug#29291
X-Git-Tag: emacs-26.0.91~310
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a5ec644caa746092a9a1d002f565d4fb260f9567;p=emacs.git

Fix Bug#29291

* test/lisp/net/tramp-tests.el (tramp-test24-file-acl):
Preserve permissions when copying.  (Bug#29291)
---

diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index a43ac739496..68236daf49b 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -2940,7 +2940,7 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
 	    (write-region "foo" nil tmp-name1)
 	    (should (file-exists-p tmp-name1))
 	    (should (file-acl tmp-name1))
-	    (copy-file tmp-name1 tmp-name2)
+	    (copy-file tmp-name1 tmp-name2 nil nil nil 'preserve-permissions)
 	    (should (file-acl tmp-name2))
 	    (should (string-equal (file-acl tmp-name1) (file-acl tmp-name2)))
 	    ;; Different permissions mean different ACLs.
@@ -2966,7 +2966,7 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
 	    (write-region "foo" nil tmp-name1)
 	    (should (file-exists-p tmp-name1))
 	    (should (file-acl tmp-name1))
-	    (copy-file tmp-name1 tmp-name3)
+	    (copy-file tmp-name1 tmp-name3 nil nil nil 'preserve-permissions)
 	    (should (file-acl tmp-name3))
 	    (should (string-equal (file-acl tmp-name1) (file-acl tmp-name3)))
 	    ;; Different permissions mean different ACLs.
@@ -2980,7 +2980,7 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
 
 	    ;; Two files with same ACLs.
 	    (delete-file tmp-name1)
-	    (copy-file tmp-name3 tmp-name1)
+	    (copy-file tmp-name3 tmp-name1 nil nil nil 'preserve-permissions)
 	    (should (file-acl tmp-name1))
 	    (should (string-equal (file-acl tmp-name1) (file-acl tmp-name3)))
 	    ;; Different permissions mean different ACLs.