Avoid tests failures on hydra due to Tramp autoload changes

* test/lisp/filenotify-tests.el, test/lisp/shadowfile-tests.el:
* test/lisp/net/tramp-tests.el: Require tramp-sh before changing
tramp-remote-path.

diff --git a/test/lisp/filenotify-tests.el b/test/lisp/filenotify-tests.el
index 26b8276b8ec0c2df3f2941b460a942a5d2ab55d2..376b20988af810f987d21e03af314dcd13529acd 100644 (file)
--- a/test/lisp/filenotify-tests.el
+++ b/test/lisp/filenotify-tests.el
@@ -180,6 +180,7 @@ Return nil when any other file notification watch is still active."
 
 ;; This should happen on hydra only.
 (when (getenv "EMACS_HYDRA_CI")
+  (require 'tramp-sh)
   (add-to-list 'tramp-remote-path 'tramp-own-remote-path))
 
 ;; We do not want to try and fail `file-notify-add-watch'.

diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 57b67a0bfe4be4cd366612a8dc637c19c12a8a13..c566f81610b6811435103dfeff4b0aa8998ee967 100644 (file)
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -107,6 +107,7 @@
 
 ;; This should happen on hydra only.
 (when (getenv "EMACS_HYDRA_CI")
+  (require 'tramp-sh)
   (add-to-list 'tramp-remote-path 'tramp-own-remote-path))
 
 (defvar tramp--test-enabled-checked nil

diff --git a/test/lisp/shadowfile-tests.el b/test/lisp/shadowfile-tests.el
index 3bab22f8d665ebb05a1adb3ff9de8f09ca6e8ed6..1527d2b2abf395f8dea472b5041ee5e607b0ffea 100644 (file)
--- a/test/lisp/shadowfile-tests.el
+++ b/test/lisp/shadowfile-tests.el
@@ -69,6 +69,7 @@
 
 ;; This should happen on hydra only.
 (when (getenv "EMACS_HYDRA_CI")
+  (require 'tramp-sh)
   (add-to-list 'tramp-remote-path 'tramp-own-remote-path))
 
 (defconst shadow-test-info-file