aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorGlenn Morris2018-12-17 13:52:46 -0500
committerGlenn Morris2018-12-17 13:52:46 -0500
commit2c3f7f9c45985c36fd9e86c334b49b10e8c8c270 (patch)
tree0d116c71d0ea30041532663fa30f34655d6bb0ef /test
parent3621593616c1c4ae880c72e8d3de8fac8fc9c581 (diff)
downloademacs-2c3f7f9c45985c36fd9e86c334b49b10e8c8c270.tar.gz
emacs-2c3f7f9c45985c36fd9e86c334b49b10e8c8c270.zip
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.
Diffstat (limited to 'test')
-rw-r--r--test/lisp/filenotify-tests.el1
-rw-r--r--test/lisp/net/tramp-tests.el1
-rw-r--r--test/lisp/shadowfile-tests.el1
3 files changed, 3 insertions, 0 deletions
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."
180 180
181;; This should happen on hydra only. 181;; This should happen on hydra only.
182(when (getenv "EMACS_HYDRA_CI") 182(when (getenv "EMACS_HYDRA_CI")
183 (require 'tramp-sh)
183 (add-to-list 'tramp-remote-path 'tramp-own-remote-path)) 184 (add-to-list 'tramp-remote-path 'tramp-own-remote-path))
184 185
185;; We do not want to try and fail `file-notify-add-watch'. 186;; 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 @@
107 107
108;; This should happen on hydra only. 108;; This should happen on hydra only.
109(when (getenv "EMACS_HYDRA_CI") 109(when (getenv "EMACS_HYDRA_CI")
110 (require 'tramp-sh)
110 (add-to-list 'tramp-remote-path 'tramp-own-remote-path)) 111 (add-to-list 'tramp-remote-path 'tramp-own-remote-path))
111 112
112(defvar tramp--test-enabled-checked nil 113(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 @@
69 69
70;; This should happen on hydra only. 70;; This should happen on hydra only.
71(when (getenv "EMACS_HYDRA_CI") 71(when (getenv "EMACS_HYDRA_CI")
72 (require 'tramp-sh)
72 (add-to-list 'tramp-remote-path 'tramp-own-remote-path)) 73 (add-to-list 'tramp-remote-path 'tramp-own-remote-path))
73 74
74(defconst shadow-test-info-file 75(defconst shadow-test-info-file