aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMichael Albinus2020-06-09 13:43:30 +0200
committerMichael Albinus2020-06-09 13:43:30 +0200
commit4b21759b6f06f4560e5c8d7e4c52ce5c55393957 (patch)
treedaaec99610479ff2e0494630396bcd3bcea2c7c6 /test
parent3b93549597f187989e5508b638f297d0244e5cc6 (diff)
downloademacs-4b21759b6f06f4560e5c8d7e4c52ce5c55393957.tar.gz
emacs-4b21759b6f06f4560e5c8d7e4c52ce5c55393957.zip
Continue implementation of tramp-crypt.el
* lisp/net/tramp-crypt.el (tramp-crypt-do-encrypt-or-decrypt-file): Add leading "/" to infile. (tramp-crypt-add-directory): Fix docstring. Expand NAME. (tramp-crypt-remove-directory) (tramp-crypt-handle-file-name-all-completions) (tramp-crypt-handle-set-file-times): New defuns. (tramp-crypt-handle-file-executable-p) (tramp-crypt-handle-file-readable-p) (tramp-crypt-handle-file-system-info) (tramp-crypt-handle-set-file-modes): Fix implementation. * test/lisp/net/tramp-tests.el: Adapt call convention for (tramp--test-crypt-p).
Diffstat (limited to 'test')
-rw-r--r--test/lisp/net/tramp-tests.el32
1 files changed, 16 insertions, 16 deletions
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 7faa409f2f0..d578c359d79 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -3815,7 +3815,7 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
3815 "Check that `file-acl' and `set-file-acl' work proper." 3815 "Check that `file-acl' and `set-file-acl' work proper."
3816 (skip-unless (tramp--test-enabled)) 3816 (skip-unless (tramp--test-enabled))
3817 (skip-unless (file-acl tramp-test-temporary-file-directory)) 3817 (skip-unless (file-acl tramp-test-temporary-file-directory))
3818 (skip-unless (null (tramp--test-crypt-p))) 3818 (skip-unless (not (tramp--test-crypt-p)))
3819 3819
3820 ;; `filename-non-special' has been fixed in Emacs 27.1, see Bug#29579. 3820 ;; `filename-non-special' has been fixed in Emacs 27.1, see Bug#29579.
3821 (dolist (quoted (if (and (tramp--test-expensive-test) (tramp--test-emacs27-p)) 3821 (dolist (quoted (if (and (tramp--test-expensive-test) (tramp--test-emacs27-p))
@@ -3894,7 +3894,7 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
3894 (skip-unless 3894 (skip-unless
3895 (not (equal (file-selinux-context tramp-test-temporary-file-directory) 3895 (not (equal (file-selinux-context tramp-test-temporary-file-directory)
3896 '(nil nil nil nil)))) 3896 '(nil nil nil nil))))
3897 (skip-unless (null (tramp--test-crypt-p))) 3897 (skip-unless (not (tramp--test-crypt-p)))
3898 3898
3899 ;; `filename-non-special' has been fixed in Emacs 27.1, see Bug#29579. 3899 ;; `filename-non-special' has been fixed in Emacs 27.1, see Bug#29579.
3900 (dolist (quoted (if (and (tramp--test-expensive-test) (tramp--test-emacs27-p)) 3900 (dolist (quoted (if (and (tramp--test-expensive-test) (tramp--test-emacs27-p))
@@ -4198,7 +4198,7 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
4198 :tags '(:expensive-test) 4198 :tags '(:expensive-test)
4199 (skip-unless (tramp--test-enabled)) 4199 (skip-unless (tramp--test-enabled))
4200 (skip-unless (or (tramp--test-adb-p) (tramp--test-sh-p))) 4200 (skip-unless (or (tramp--test-adb-p) (tramp--test-sh-p)))
4201 (skip-unless (null (tramp--test-crypt-p))) 4201 (skip-unless (not (tramp--test-crypt-p)))
4202 4202
4203 (dolist (quoted (if (tramp--test-expensive-test) '(nil t) '(nil))) 4203 (dolist (quoted (if (tramp--test-expensive-test) '(nil t) '(nil)))
4204 (let* ((tmp-name (tramp--test-make-temp-name nil quoted)) 4204 (let* ((tmp-name (tramp--test-make-temp-name nil quoted))
@@ -4277,7 +4277,7 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
4277 :tags '(:expensive-test) 4277 :tags '(:expensive-test)
4278 (skip-unless (tramp--test-enabled)) 4278 (skip-unless (tramp--test-enabled))
4279 (skip-unless (or (tramp--test-adb-p) (tramp--test-sh-p))) 4279 (skip-unless (or (tramp--test-adb-p) (tramp--test-sh-p)))
4280 (skip-unless (null (tramp--test-crypt-p))) 4280 (skip-unless (not (tramp--test-crypt-p)))
4281 4281
4282 (dolist (quoted (if (tramp--test-expensive-test) '(nil t) '(nil))) 4282 (dolist (quoted (if (tramp--test-expensive-test) '(nil t) '(nil)))
4283 (let ((default-directory tramp-test-temporary-file-directory) 4283 (let ((default-directory tramp-test-temporary-file-directory)
@@ -4351,7 +4351,7 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
4351 :tags '(:expensive-test) 4351 :tags '(:expensive-test)
4352 (skip-unless (tramp--test-enabled)) 4352 (skip-unless (tramp--test-enabled))
4353 (skip-unless (or (tramp--test-adb-p) (tramp--test-sh-p))) 4353 (skip-unless (or (tramp--test-adb-p) (tramp--test-sh-p)))
4354 (skip-unless (null (tramp--test-crypt-p))) 4354 (skip-unless (not (tramp--test-crypt-p)))
4355 ;; `make-process' supports file name handlers since Emacs 27. 4355 ;; `make-process' supports file name handlers since Emacs 27.
4356 (skip-unless (tramp--test-emacs27-p)) 4356 (skip-unless (tramp--test-emacs27-p))
4357 4357
@@ -4522,7 +4522,7 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
4522 :tags '(:expensive-test) 4522 :tags '(:expensive-test)
4523 (skip-unless (tramp--test-enabled)) 4523 (skip-unless (tramp--test-enabled))
4524 (skip-unless (tramp--test-sh-p)) 4524 (skip-unless (tramp--test-sh-p))
4525 (skip-unless (null (tramp--test-crypt-p))) 4525 (skip-unless (not (tramp--test-crypt-p)))
4526 ;; Since Emacs 26.1. 4526 ;; Since Emacs 26.1.
4527 (skip-unless (boundp 'interrupt-process-functions)) 4527 (skip-unless (boundp 'interrupt-process-functions))
4528 4528
@@ -4583,7 +4583,7 @@ INPUT, if non-nil, is a string sent to the process."
4583 ;; remote processes in Emacs. That doesn't work for tramp-adb.el. 4583 ;; remote processes in Emacs. That doesn't work for tramp-adb.el.
4584 (skip-unless (or (and (tramp--test-adb-p) (tramp--test-emacs27-p)) 4584 (skip-unless (or (and (tramp--test-adb-p) (tramp--test-emacs27-p))
4585 (tramp--test-sh-p))) 4585 (tramp--test-sh-p)))
4586 (skip-unless (null (tramp--test-crypt-p))) 4586 (skip-unless (not (tramp--test-crypt-p)))
4587 4587
4588 (dolist (quoted (if (tramp--test-expensive-test) '(nil t) '(nil))) 4588 (dolist (quoted (if (tramp--test-expensive-test) '(nil t) '(nil)))
4589 (let ((tmp-name (tramp--test-make-temp-name nil quoted)) 4589 (let ((tmp-name (tramp--test-make-temp-name nil quoted))
@@ -4675,7 +4675,7 @@ INPUT, if non-nil, is a string sent to the process."
4675 :tags '(:expensive-test) 4675 :tags '(:expensive-test)
4676 (skip-unless (tramp--test-enabled)) 4676 (skip-unless (tramp--test-enabled))
4677 (skip-unless (or (tramp--test-adb-p) (tramp--test-sh-p))) 4677 (skip-unless (or (tramp--test-adb-p) (tramp--test-sh-p)))
4678 (skip-unless (null (tramp--test-crypt-p))) 4678 (skip-unless (not (tramp--test-crypt-p)))
4679 ;; Prior Emacs 27, `shell-command-dont-erase-buffer' wasn't working properly. 4679 ;; Prior Emacs 27, `shell-command-dont-erase-buffer' wasn't working properly.
4680 (skip-unless (tramp--test-emacs27-p)) 4680 (skip-unless (tramp--test-emacs27-p))
4681 4681
@@ -4888,7 +4888,7 @@ INPUT, if non-nil, is a string sent to the process."
4888 :tags '(:expensive-test) 4888 :tags '(:expensive-test)
4889 (skip-unless (tramp--test-enabled)) 4889 (skip-unless (tramp--test-enabled))
4890 (skip-unless (tramp--test-sh-p)) 4890 (skip-unless (tramp--test-sh-p))
4891 (skip-unless (null (tramp--test-crypt-p))) 4891 (skip-unless (not (tramp--test-crypt-p)))
4892 4892
4893 (dolist (this-shell-command-to-string 4893 (dolist (this-shell-command-to-string
4894 '(;; Synchronously. 4894 '(;; Synchronously.
@@ -4975,7 +4975,7 @@ INPUT, if non-nil, is a string sent to the process."
4975 ;; We test it only for the mock-up connection; otherwise there might 4975 ;; We test it only for the mock-up connection; otherwise there might
4976 ;; be problems with the used ports. 4976 ;; be problems with the used ports.
4977 (skip-unless (and (eq tramp-syntax 'default) (tramp--test-mock-p))) 4977 (skip-unless (and (eq tramp-syntax 'default) (tramp--test-mock-p)))
4978 (skip-unless (null (tramp--test-crypt-p))) 4978 (skip-unless (not (tramp--test-crypt-p)))
4979 4979
4980 ;; We force a reconnect, in order to have a clean environment. 4980 ;; We force a reconnect, in order to have a clean environment.
4981 (dolist (dir `(,tramp-test-temporary-file-directory 4981 (dolist (dir `(,tramp-test-temporary-file-directory
@@ -5080,7 +5080,7 @@ INPUT, if non-nil, is a string sent to the process."
5080 ;; remote processes in Emacs. That doesn't work for tramp-adb.el. 5080 ;; remote processes in Emacs. That doesn't work for tramp-adb.el.
5081 (skip-unless (or (and (tramp--test-adb-p) (tramp--test-emacs27-p)) 5081 (skip-unless (or (and (tramp--test-adb-p) (tramp--test-emacs27-p))
5082 (tramp--test-sh-p))) 5082 (tramp--test-sh-p)))
5083 (skip-unless (null (tramp--test-crypt-p))) 5083 (skip-unless (not (tramp--test-crypt-p)))
5084 ;; Since Emacs 26.1. 5084 ;; Since Emacs 26.1.
5085 (skip-unless (and (fboundp 'connection-local-set-profile-variables) 5085 (skip-unless (and (fboundp 'connection-local-set-profile-variables)
5086 (fboundp 'connection-local-set-profiles))) 5086 (fboundp 'connection-local-set-profiles)))
@@ -5137,7 +5137,7 @@ INPUT, if non-nil, is a string sent to the process."
5137 "Check `exec-path' and `executable-find'." 5137 "Check `exec-path' and `executable-find'."
5138 (skip-unless (tramp--test-enabled)) 5138 (skip-unless (tramp--test-enabled))
5139 (skip-unless (or (tramp--test-adb-p) (tramp--test-sh-p))) 5139 (skip-unless (or (tramp--test-adb-p) (tramp--test-sh-p)))
5140 (skip-unless (null (tramp--test-crypt-p))) 5140 (skip-unless (not (tramp--test-crypt-p)))
5141 ;; Since Emacs 27.1. 5141 ;; Since Emacs 27.1.
5142 (skip-unless (fboundp 'exec-path)) 5142 (skip-unless (fboundp 'exec-path))
5143 5143
@@ -5181,7 +5181,7 @@ INPUT, if non-nil, is a string sent to the process."
5181 "Check loooong `tramp-remote-path'." 5181 "Check loooong `tramp-remote-path'."
5182 (skip-unless (tramp--test-enabled)) 5182 (skip-unless (tramp--test-enabled))
5183 (skip-unless (tramp--test-sh-p)) 5183 (skip-unless (tramp--test-sh-p))
5184 (skip-unless (null (tramp--test-crypt-p))) 5184 (skip-unless (not (tramp--test-crypt-p)))
5185 ;; Since Emacs 27.1. 5185 ;; Since Emacs 27.1.
5186 (skip-unless (fboundp 'exec-path)) 5186 (skip-unless (fboundp 'exec-path))
5187 5187
@@ -5246,7 +5246,7 @@ INPUT, if non-nil, is a string sent to the process."
5246 :tags '(:expensive-test) 5246 :tags '(:expensive-test)
5247 (skip-unless (tramp--test-enabled)) 5247 (skip-unless (tramp--test-enabled))
5248 (skip-unless (tramp--test-sh-p)) 5248 (skip-unless (tramp--test-sh-p))
5249 (skip-unless (null (tramp--test-crypt-p))) 5249 (skip-unless (not (tramp--test-crypt-p)))
5250 5250
5251 (dolist (quoted (if (tramp--test-expensive-test) '(nil t) '(nil))) 5251 (dolist (quoted (if (tramp--test-expensive-test) '(nil t) '(nil)))
5252 ;; We must use `file-truename' for the temporary directory, in 5252 ;; We must use `file-truename' for the temporary directory, in
@@ -5835,7 +5835,7 @@ This requires restrictions of file name syntax."
5835 ;; We do not run on macOS due to encoding problems. See 5835 ;; We do not run on macOS due to encoding problems. See
5836 ;; Bug#36940. 5836 ;; Bug#36940.
5837 (when (and (tramp--test-expensive-test) (tramp--test-sh-p) 5837 (when (and (tramp--test-expensive-test) (tramp--test-sh-p)
5838 (null (tramp--test-crypt-p)) 5838 (not (tramp--test-crypt-p))
5839 (not (eq system-type 'darwin))) 5839 (not (eq system-type 'darwin)))
5840 (dolist (elt files) 5840 (dolist (elt files)
5841 (let ((envvar (concat "VAR_" (upcase (md5 elt)))) 5841 (let ((envvar (concat "VAR_" (upcase (md5 elt))))
@@ -6168,7 +6168,7 @@ process sentinels. They shall not disturb each other."
6168 ;; remote processes in Emacs. That doesn't work for tramp-adb.el. 6168 ;; remote processes in Emacs. That doesn't work for tramp-adb.el.
6169 (skip-unless (or (and (tramp--test-adb-p) (tramp--test-emacs27-p)) 6169 (skip-unless (or (and (tramp--test-adb-p) (tramp--test-emacs27-p))
6170 (tramp--test-sh-p))) 6170 (tramp--test-sh-p)))
6171 (skip-unless (null (tramp--test-crypt-p))) 6171 (skip-unless (not (tramp--test-crypt-p)))
6172 6172
6173 (with-timeout 6173 (with-timeout
6174 (tramp--test-asynchronous-requests-timeout (tramp--test-timeout-handler)) 6174 (tramp--test-asynchronous-requests-timeout (tramp--test-timeout-handler))