emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master 8b6812f: Minor change in tramp-tests.el


From: Michael Albinus
Subject: [Emacs-diffs] master 8b6812f: Minor change in tramp-tests.el
Date: Sun, 1 Jul 2018 05:59:04 -0400 (EDT)

branch: master
commit 8b6812fd905be2484364c75a62fd7e371d686adb
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>

    Minor change in tramp-tests.el
    
    * test/lisp/net/tramp-tests.el (tramp-test03-file-name-host-rules):
    Cleanup before running the test.
---
 test/lisp/net/tramp-tests.el | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 504b0aa..5c5eff8 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -1745,7 +1745,9 @@ handled properly.  BODY shall not contain a timeout."
   ;; Host names must match rules in case the command template of a
   ;; method doesn't use them.
   (dolist (m '("su" "sg" "sudo" "doas" "ksu"))
-    (let (tramp-default-proxies-alist)
+    (let ((vec (tramp-dissect-file-name tramp-test-temporary-file-directory))
+         tramp-connection-properties tramp-default-proxies-alist)
+      (ignore-errors (tramp-cleanup-connection vec nil 'keep-password))
       ;; Single hop.  The host name must match `tramp-local-host-regexp'.
       (should-error
        (find-file (format "/%s:foo:" m))
@@ -1758,9 +1760,7 @@ handled properly.  BODY shall not contain a timeout."
         (substring (file-remote-p tramp-test-temporary-file-directory) 0 -1)
         m))
        :type
-       (if (tramp-method-out-of-band-p
-           (tramp-dissect-file-name tramp-test-temporary-file-directory) 0)
-          'file-error 'user-error)))))
+       (if (tramp-method-out-of-band-p vec 0) 'file-error 'user-error)))))
 
 (ert-deftest tramp-test03-file-name-method-rules ()
   "Check file name rules for some methods."



reply via email to

[Prev in Thread] Current Thread [Next in Thread]