aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2017-03-10 14:34:23 +0100
committerMichael Albinus2017-03-10 14:34:23 +0100
commit7e434ed2ebc4f9fddd6f7d34e7a9907729fd3bcf (patch)
treecee2c624b13e2563022b4aaa90a8111cbe8209da
parentae6b2b8918007c8694563dd8ba14207a560d72c1 (diff)
downloademacs-7e434ed2ebc4f9fddd6f7d34e7a9907729fd3bcf.tar.gz
emacs-7e434ed2ebc4f9fddd6f7d34e7a9907729fd3bcf.zip
Adapt tramp-tests.el
* test/lisp/net/tramp-tests.el (tramp-test06-directory-file-name) (tramp-test24-file-name-completion): Call `tramp-completion-mode-p' with argument.
-rw-r--r--test/lisp/net/tramp-tests.el7
1 files changed, 5 insertions, 2 deletions
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 0c3068aeb09..a854f4e87dc 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -732,7 +732,8 @@ This checks also `file-name-as-directory', `file-name-directory',
732 (should 732 (should
733 (string-equal 733 (string-equal
734 (file-name-as-directory file) 734 (file-name-as-directory file)
735 (if (tramp-completion-mode-p) file (concat file "./")))) 735 (if (tramp-completion-mode-p (tramp-dissect-file-name file))
736 file (concat file "./"))))
736 (should (string-equal (file-name-directory file) file)) 737 (should (string-equal (file-name-directory file) file))
737 (should (string-equal (file-name-nondirectory file) "")))))))) 738 (should (string-equal (file-name-nondirectory file) ""))))))))
738 739
@@ -1515,7 +1516,9 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
1515 (progn 1516 (progn
1516 ;; Method and host name in completion mode. This kind 1517 ;; Method and host name in completion mode. This kind
1517 ;; of completion does not work on MS Windows. 1518 ;; of completion does not work on MS Windows.
1518 (when (and (tramp-completion-mode-p) 1519 (when (and (tramp-completion-mode-p
1520 (tramp-dissect-file-name
1521 tramp-test-temporary-file-directory))
1519 (not (memq system-type '(cygwin windows-nt)))) 1522 (not (memq system-type '(cygwin windows-nt))))
1520 (unless (zerop (length method)) 1523 (unless (zerop (length method))
1521 (should 1524 (should