From 2c3f7f9c45985c36fd9e86c334b49b10e8c8c270 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 17 Dec 2018 13:52:46 -0500 Subject: [PATCH] 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. --- test/lisp/filenotify-tests.el | 1 + test/lisp/net/tramp-tests.el | 1 + test/lisp/shadowfile-tests.el | 1 + 3 files changed, 3 insertions(+) diff --git a/test/lisp/filenotify-tests.el b/test/lisp/filenotify-tests.el index 26b8276b8ec..376b20988af 100644 --- 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 57b67a0bfe4..c566f81610b 100644 --- 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 3bab22f8d66..1527d2b2abf 100644 --- 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 -- 2.39.2