]> git.eshelyaron.com Git - emacs.git/commitdiff
Adapt tramp-tests.el
authorMichael Albinus <michael.albinus@gmx.de>
Fri, 10 Mar 2017 13:34:23 +0000 (14:34 +0100)
committerMichael Albinus <michael.albinus@gmx.de>
Fri, 10 Mar 2017 13:34:23 +0000 (14:34 +0100)
* test/lisp/net/tramp-tests.el (tramp-test06-directory-file-name)
(tramp-test24-file-name-completion): Call
`tramp-completion-mode-p' with argument.

test/lisp/net/tramp-tests.el

index 0c3068aeb093214458a633aa2194125fb8645a0f..a854f4e87dc97781a8dab13faac445dbc35321fb 100644 (file)
@@ -732,7 +732,8 @@ This checks also `file-name-as-directory', `file-name-directory',
            (should
             (string-equal
              (file-name-as-directory file)
-             (if (tramp-completion-mode-p) file (concat file "./"))))
+             (if (tramp-completion-mode-p (tramp-dissect-file-name file))
+                 file (concat file "./"))))
            (should (string-equal (file-name-directory file) file))
            (should (string-equal (file-name-nondirectory file) ""))))))))
 
@@ -1515,7 +1516,9 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
            (progn
              ;; Method and host name in completion mode.  This kind
              ;; of completion does not work on MS Windows.
-             (when (and (tramp-completion-mode-p)
+             (when (and (tramp-completion-mode-p
+                         (tramp-dissect-file-name
+                          tramp-test-temporary-file-directory))
                         (not (memq system-type '(cygwin windows-nt))))
                (unless (zerop (length method))
                  (should