diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2017-11-19 11:06:19 +0100 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2017-11-19 11:06:19 +0100 |
| commit | ecda09c22dd546af70cc02bd6211640f5b38558d (patch) | |
| tree | 9e1947be97f1ca63e1a774e7ef4421d8cb29a70d | |
| parent | afbd8140e41abcc32c628cf493cc2783fe348115 (diff) | |
| download | emacs-ecda09c22dd546af70cc02bd6211640f5b38558d.tar.gz | |
; * test/lisp/net/tramp-tests.el (tramp-test24-file-acl): More instrumentation
| -rw-r--r-- | test/lisp/net/tramp-tests.el | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index 6d5cc5df8ff..1ad286bf60b 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el @@ -2942,23 +2942,14 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." (should (file-acl tmp-name1)) (copy-file tmp-name1 tmp-name2 nil nil nil 'preserve-permissions) (should (file-acl tmp-name2)) - (tramp--test-message - "tmp-name1:\n%stmp-name2:\n%s" - (file-acl tmp-name1) (file-acl tmp-name2)) (should (string-equal (file-acl tmp-name1) (file-acl tmp-name2))) ;; Different permissions mean different ACLs. (set-file-modes tmp-name1 #o777) (set-file-modes tmp-name2 #o444) - (tramp--test-message - "tmp-name1:\n%stmp-name2:\n%s" - (file-acl tmp-name1) (file-acl tmp-name2)) (should-not (string-equal (file-acl tmp-name1) (file-acl tmp-name2))) ;; Copy ACL. (should (set-file-acl tmp-name2 (file-acl tmp-name1))) - (tramp--test-message - "tmp-name1:\n%stmp-name2:\n%s" - (file-acl tmp-name1) (file-acl tmp-name2)) (should (string-equal (file-acl tmp-name1) (file-acl tmp-name2))) ;; An invalid ACL does not harm. (should-not (set-file-acl tmp-name2 "foo"))) @@ -2989,12 +2980,13 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." (file-acl tmp-name1) (file-acl tmp-name3)) (should-not (string-equal (file-acl tmp-name1) (file-acl tmp-name3))) - ;; Copy ACL. - (set-file-acl tmp-name3 (file-acl tmp-name1)) - (tramp--test-message - "tmp-name1:\n%stmp-name3:\n%s" - (file-acl tmp-name1) (file-acl tmp-name3)) - (should (string-equal (file-acl tmp-name1) (file-acl tmp-name3))) + ;; Copy ACL. Since we don't know whether Emacs is built + ;; with local ACL support, we must check it. + (when (set-file-acl tmp-name3 (file-acl tmp-name1)) + (tramp--test-message + "tmp-name1:\n%stmp-name3:\n%s" + (file-acl tmp-name1) (file-acl tmp-name3)) + (should (string-equal (file-acl tmp-name1) (file-acl tmp-name3)))) ;; Two files with same ACLs. (delete-file tmp-name1) |