diff options
| author | Michael Albinus | 2020-06-21 15:19:51 +0200 |
|---|---|---|
| committer | Michael Albinus | 2020-06-21 15:19:51 +0200 |
| commit | f18b035763785ffa9d8e27f3ec2be183b741502e (patch) | |
| tree | 8b07b6c4158d2ef319145952bd134d5ed1b65b16 /test | |
| parent | 1ecd350f38ee782cdebf4b08a59f2c1974ad44bd (diff) | |
| download | emacs-f18b035763785ffa9d8e27f3ec2be183b741502e.tar.gz emacs-f18b035763785ffa9d8e27f3ec2be183b741502e.zip | |
Fix remaining problems with tramp-crypt.el
* lisp/net/tramp-compat.el (tramp-compat-make-temp-file):
Simplify implementation.
* lisp/net/tramp-crypt.el (tramp-crypt-handle-delete-file)
(tramp-crypt-handle-file-attributes, tramp-crypt-handle-file-system-info)
(tramp-crypt-handle-make-directory): Let-bind `tramp-crypt-enabled' to nil.
* lisp/net/tramp.el (tramp-file-name-for-operation): Fix for operations
with two arguments.
(tramp-handle-load): Suppress `signal-hook-function' when NOERROR
is non-nil.
* test/lisp/net/tramp-tests.el (tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls): Skip if needed.
Diffstat (limited to 'test')
| -rw-r--r-- | test/lisp/net/tramp-tests.el | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index cb30a360225..43630c4debd 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el | |||
| @@ -6042,6 +6042,7 @@ Use the `ls' command." | |||
| 6042 | (skip-unless (not (tramp--test-windows-nt-and-batch))) | 6042 | (skip-unless (not (tramp--test-windows-nt-and-batch))) |
| 6043 | (skip-unless (not (tramp--test-windows-nt-and-pscp-psftp-p))) | 6043 | (skip-unless (not (tramp--test-windows-nt-and-pscp-psftp-p))) |
| 6044 | (skip-unless (not (tramp--test-ksh-p))) | 6044 | (skip-unless (not (tramp--test-ksh-p))) |
| 6045 | (skip-unless (not (tramp--test-crypt-p))) | ||
| 6045 | 6046 | ||
| 6046 | (tramp--test-utf8)) | 6047 | (tramp--test-utf8)) |
| 6047 | 6048 | ||
| @@ -6056,6 +6057,7 @@ Use the `stat' command." | |||
| 6056 | (skip-unless (not (tramp--test-windows-nt-and-batch))) | 6057 | (skip-unless (not (tramp--test-windows-nt-and-batch))) |
| 6057 | (skip-unless (not (tramp--test-windows-nt-and-pscp-psftp-p))) | 6058 | (skip-unless (not (tramp--test-windows-nt-and-pscp-psftp-p))) |
| 6058 | (skip-unless (not (tramp--test-ksh-p))) | 6059 | (skip-unless (not (tramp--test-ksh-p))) |
| 6060 | (skip-unless (not (tramp--test-crypt-p))) | ||
| 6059 | (with-parsed-tramp-file-name tramp-test-temporary-file-directory nil | 6061 | (with-parsed-tramp-file-name tramp-test-temporary-file-directory nil |
| 6060 | (skip-unless (tramp-get-remote-stat v))) | 6062 | (skip-unless (tramp-get-remote-stat v))) |
| 6061 | 6063 | ||
| @@ -6077,6 +6079,7 @@ Use the `perl' command." | |||
| 6077 | (skip-unless (not (tramp--test-windows-nt-and-batch))) | 6079 | (skip-unless (not (tramp--test-windows-nt-and-batch))) |
| 6078 | (skip-unless (not (tramp--test-windows-nt-and-pscp-psftp-p))) | 6080 | (skip-unless (not (tramp--test-windows-nt-and-pscp-psftp-p))) |
| 6079 | (skip-unless (not (tramp--test-ksh-p))) | 6081 | (skip-unless (not (tramp--test-ksh-p))) |
| 6082 | (skip-unless (not (tramp--test-crypt-p))) | ||
| 6080 | (with-parsed-tramp-file-name tramp-test-temporary-file-directory nil | 6083 | (with-parsed-tramp-file-name tramp-test-temporary-file-directory nil |
| 6081 | (skip-unless (tramp-get-remote-perl v))) | 6084 | (skip-unless (tramp-get-remote-perl v))) |
| 6082 | 6085 | ||
| @@ -6101,6 +6104,7 @@ Use the `ls' command." | |||
| 6101 | (skip-unless (not (tramp--test-windows-nt-and-batch))) | 6104 | (skip-unless (not (tramp--test-windows-nt-and-batch))) |
| 6102 | (skip-unless (not (tramp--test-windows-nt-and-pscp-psftp-p))) | 6105 | (skip-unless (not (tramp--test-windows-nt-and-pscp-psftp-p))) |
| 6103 | (skip-unless (not (tramp--test-ksh-p))) | 6106 | (skip-unless (not (tramp--test-ksh-p))) |
| 6107 | (skip-unless (not (tramp--test-crypt-p))) | ||
| 6104 | 6108 | ||
| 6105 | (let ((tramp-connection-properties | 6109 | (let ((tramp-connection-properties |
| 6106 | (append | 6110 | (append |