summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2026-05-23 10:25:46 +0200
committerMichael Albinus <michael.albinus@gmx.de>2026-05-23 10:25:46 +0200
commit3d2bb233f27c00dac2bec0c70a569a6232f37c54 (patch)
tree10d59a37be738f0555b099e29948953d5e8366dd /test
parentf6281d757d35bb93790732164f9d8d11c043c00c (diff)
; Minor Tramp changes
* doc/misc/tramp.texi (Frequently Asked Questions): google-drive has been disabled in GNOME 50. * lisp/net/tramp-cmds.el (tramp-enable-method): Upcase prompt. * lisp/net/tramp-sh.el (tramp-sh-handle-make-process) (tramp-sh-handle-process-file): Improve setting of environment variables. * test/lisp/net/tramp-tests.el (tramp-methods) <mock>: Add `tramp-tmpdir'. Adapt `tramp-login-program'. (ert-remote-temporary-file-directory): Improve expansion. (tramp-test35-remote-path): Adapt test.
Diffstat (limited to 'test')
-rw-r--r--test/lisp/net/tramp-tests.el12
1 files changed, 5 insertions, 7 deletions
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index c0ad7205c5d..4d11faf64de 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -117,9 +117,10 @@
(t (add-to-list
'tramp-methods
`("mock"
- (tramp-login-program ,tramp-default-remote-shell)
+ (tramp-login-program ,tramp-encoding-shell)
(tramp-login-args (("-i")))
(tramp-direct-async ("-c"))
+ (tramp-tmpdir ,temporary-file-directory)
(tramp-remote-shell ,tramp-default-remote-shell)
(tramp-remote-shell-args ("-c"))
(tramp-connection-timeout 10)))
@@ -225,7 +226,8 @@
auto-revert-use-notify t
ert-batch-backtrace-right-margin nil
ert-remote-temporary-file-directory
- (expand-file-name ert-remote-temporary-file-directory)
+ (let ((tramp-show-ad-hoc-proxies t) (non-essential t))
+ (expand-file-name ert-remote-temporary-file-directory))
password-cache-expiry nil
remote-file-name-inhibit-cache nil
tramp-allow-unsafe-temporary-files t
@@ -6855,8 +6857,7 @@ INPUT, if non-nil, is a string sent to the process."
"Check loooong `tramp-remote-path'."
:tags '(:expensive-test)
(skip-unless (tramp--test-enabled))
- (skip-unless (tramp--test-sh-p))
- (skip-unless (not (tramp--test-crypt-p)))
+ (skip-unless (tramp--test-supports-environment-variables-p))
(let* ((tmp-name1 (tramp--test-make-temp-name))
(default-directory ert-remote-temporary-file-directory)
@@ -9330,9 +9331,6 @@ If INTERACTIVE is non-nil, the tests are run interactively."
;; Use `skip-when' starting with Emacs 30.1.
-;; Starting with Emacs 29, use `ert-with-temp-file' and
-;; `ert-with-temp-directory'.
-
(provide 'tramp-tests)
;;; tramp-tests.el ends here