aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2016-05-11 10:12:26 +0200
committerMichael Albinus2016-05-11 10:12:26 +0200
commit51c816b9aaff3d4c3b130d35d2ed7827c3e6e5fc (patch)
tree12b81dc1b2da0e46cda904bd5618dca2ae64ce2f
parent62d7acae7405732268713006d839a5c3507b9482 (diff)
downloademacs-51c816b9aaff3d4c3b130d35d2ed7827c3e6e5fc.tar.gz
emacs-51c816b9aaff3d4c3b130d35d2ed7827c3e6e5fc.zip
Fix a problem of tramp-tests on hydra.
* test/lisp/net/tramp-tests.el (tramp-test06-directory-file-name): Nullify `tramp-default-method' due to hydra.
-rw-r--r--test/lisp/net/tramp-tests.el6
1 files changed, 5 insertions, 1 deletions
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 0f40468ec98..2238da501b0 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -642,7 +642,10 @@ This checks also `file-name-as-directory', `file-name-directory',
642 (unwind-protect 642 (unwind-protect
643 ;; Bug#10085. 643 ;; Bug#10085.
644 (dolist (n-e '(nil t)) 644 (dolist (n-e '(nil t))
645 (let ((non-essential n-e)) 645 ;; We must clear `tramp-default-method'. On hydra, it is "ftp",
646 ;; which ruins the tests.
647 (let ((non-essential n-e)
648 tramp-default-method)
646 (when (getenv "NIX_STORE") 649 (when (getenv "NIX_STORE")
647 (dolist (elt (all-completions "tramp-" obarray 'functionp)) 650 (dolist (elt (all-completions "tramp-" obarray 'functionp))
648 (trace-function-background (intern elt)))) 651 (trace-function-background (intern elt))))
@@ -2327,6 +2330,7 @@ Since it unloads Tramp, it shall be the last test to run."
2327;; * set-file-selinux-context 2330;; * set-file-selinux-context
2328 2331
2329;; * Work on skipped tests. Make a comment, when it is impossible. 2332;; * Work on skipped tests. Make a comment, when it is impossible.
2333;; * Fix `tramp-test06-directory-file-name' for `ftp'.
2330;; * Fix `tramp-test15-copy-directory' for `smb'. Using tar in a pipe 2334;; * Fix `tramp-test15-copy-directory' for `smb'. Using tar in a pipe
2331;; doesn't work well when an interactive password must be provided. 2335;; doesn't work well when an interactive password must be provided.
2332;; * Fix `tramp-test27-start-file-process' on MS Windows (`process-send-eof'?). 2336;; * Fix `tramp-test27-start-file-process' on MS Windows (`process-send-eof'?).