diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2016-05-11 10:12:26 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2016-05-11 10:12:26 +0200 |
| commit | 51c816b9aaff3d4c3b130d35d2ed7827c3e6e5fc (patch) | |
| tree | 12b81dc1b2da0e46cda904bd5618dca2ae64ce2f | |
| parent | 62d7acae7405732268713006d839a5c3507b9482 (diff) | |
| download | emacs-51c816b9aaff3d4c3b130d35d2ed7827c3e6e5fc.tar.gz | |
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.el | 6 |
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', (unwind-protect ;; Bug#10085. (dolist (n-e '(nil t)) - (let ((non-essential n-e)) + ;; We must clear `tramp-default-method'. On hydra, it is "ftp", + ;; which ruins the tests. + (let ((non-essential n-e) + tramp-default-method) (when (getenv "NIX_STORE") (dolist (elt (all-completions "tramp-" obarray 'functionp)) (trace-function-background (intern elt)))) @@ -2327,6 +2330,7 @@ Since it unloads Tramp, it shall be the last test to run." ;; * set-file-selinux-context ;; * Work on skipped tests. Make a comment, when it is impossible. +;; * Fix `tramp-test06-directory-file-name' for `ftp'. ;; * Fix `tramp-test15-copy-directory' for `smb'. Using tar in a pipe ;; doesn't work well when an interactive password must be provided. ;; * Fix `tramp-test27-start-file-process' on MS Windows (`process-send-eof'?). |