aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2017-11-19 12:18:37 +0100
committerMichael Albinus2017-11-19 12:18:37 +0100
commitf41bcae3e55c4510e9f0f303962f04186f7ebdef (patch)
tree8a9c978e19162bd1f9aea19e69cc04b7bbc25939
parentecda09c22dd546af70cc02bd6211640f5b38558d (diff)
downloademacs-f41bcae3e55c4510e9f0f303962f04186f7ebdef.tar.gz
emacs-f41bcae3e55c4510e9f0f303962f04186f7ebdef.zip
; * test/lisp/net/tramp-tests.el (tramp-test24-file-acl):
Remove test instrumentation.
-rw-r--r--test/lisp/net/tramp-tests.el25
1 files changed, 3 insertions, 22 deletions
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 1ad286bf60b..80735529c18 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -2968,47 +2968,28 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
2968 (should (file-acl tmp-name1)) 2968 (should (file-acl tmp-name1))
2969 (copy-file tmp-name1 tmp-name3 nil nil nil 'preserve-permissions) 2969 (copy-file tmp-name1 tmp-name3 nil nil nil 'preserve-permissions)
2970 (should (file-acl tmp-name3)) 2970 (should (file-acl tmp-name3))
2971 (tramp--test-message
2972 "tmp-name1:\n%stmp-name3:\n%s"
2973 (file-acl tmp-name1) (file-acl tmp-name3))
2974 (should (string-equal (file-acl tmp-name1) (file-acl tmp-name3))) 2971 (should (string-equal (file-acl tmp-name1) (file-acl tmp-name3)))
2975 ;; Different permissions mean different ACLs. 2972 ;; Different permissions mean different ACLs.
2976 (set-file-modes tmp-name1 #o777) 2973 (set-file-modes tmp-name1 #o777)
2977 (set-file-modes tmp-name3 #o444) 2974 (set-file-modes tmp-name3 #o444)
2978 (tramp--test-message
2979 "tmp-name1:\n%stmp-name3:\n%s"
2980 (file-acl tmp-name1) (file-acl tmp-name3))
2981 (should-not 2975 (should-not
2982 (string-equal (file-acl tmp-name1) (file-acl tmp-name3))) 2976 (string-equal (file-acl tmp-name1) (file-acl tmp-name3)))
2983 ;; Copy ACL. Since we don't know whether Emacs is built 2977 ;; Copy ACL.
2984 ;; with local ACL support, we must check it. 2978 (file-acl tmp-name1) (file-acl tmp-name3)
2985 (when (set-file-acl tmp-name3 (file-acl tmp-name1)) 2979 (should (string-equal (file-acl tmp-name1) (file-acl tmp-name3))))
2986 (tramp--test-message
2987 "tmp-name1:\n%stmp-name3:\n%s"
2988 (file-acl tmp-name1) (file-acl tmp-name3))
2989 (should (string-equal (file-acl tmp-name1) (file-acl tmp-name3))))
2990 2980
2991 ;; Two files with same ACLs. 2981 ;; Two files with same ACLs.
2992 (delete-file tmp-name1) 2982 (delete-file tmp-name1)
2993 (copy-file tmp-name3 tmp-name1 nil nil nil 'preserve-permissions) 2983 (copy-file tmp-name3 tmp-name1 nil nil nil 'preserve-permissions)
2994 (should (file-acl tmp-name1)) 2984 (should (file-acl tmp-name1))
2995 (tramp--test-message
2996 "tmp-name1:\n%stmp-name3:\n%s"
2997 (file-acl tmp-name1) (file-acl tmp-name3))
2998 (should (string-equal (file-acl tmp-name1) (file-acl tmp-name3))) 2985 (should (string-equal (file-acl tmp-name1) (file-acl tmp-name3)))
2999 ;; Different permissions mean different ACLs. 2986 ;; Different permissions mean different ACLs.
3000 (set-file-modes tmp-name1 #o777) 2987 (set-file-modes tmp-name1 #o777)
3001 (set-file-modes tmp-name3 #o444) 2988 (set-file-modes tmp-name3 #o444)
3002 (tramp--test-message
3003 "tmp-name1:\n%stmp-name3:\n%s"
3004 (file-acl tmp-name1) (file-acl tmp-name3))
3005 (should-not 2989 (should-not
3006 (string-equal (file-acl tmp-name1) (file-acl tmp-name3))) 2990 (string-equal (file-acl tmp-name1) (file-acl tmp-name3)))
3007 ;; Copy ACL. 2991 ;; Copy ACL.
3008 (set-file-acl tmp-name1 (file-acl tmp-name3)) 2992 (set-file-acl tmp-name1 (file-acl tmp-name3))
3009 (tramp--test-message
3010 "tmp-name1:\n%stmp-name3:\n%s"
3011 (file-acl tmp-name1) (file-acl tmp-name3))
3012 (should (string-equal (file-acl tmp-name1) (file-acl tmp-name3)))) 2993 (should (string-equal (file-acl tmp-name1) (file-acl tmp-name3))))
3013 2994
3014 ;; Cleanup. 2995 ;; Cleanup.