aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2018-07-01 11:58:55 +0200
committerMichael Albinus2018-07-01 11:58:55 +0200
commit8b6812fd905be2484364c75a62fd7e371d686adb (patch)
treeccbfe62538ff3a5d3ade1fb44b9d62574a4cc108
parent32853e1531532af6f6dad4aba86cf6464aac8437 (diff)
downloademacs-8b6812fd905be2484364c75a62fd7e371d686adb.tar.gz
emacs-8b6812fd905be2484364c75a62fd7e371d686adb.zip
Minor change in tramp-tests.el
* test/lisp/net/tramp-tests.el (tramp-test03-file-name-host-rules): Cleanup before running the test.
-rw-r--r--test/lisp/net/tramp-tests.el8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 504b0aae785..5c5eff8798d 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."
1745 ;; Host names must match rules in case the command template of a 1745 ;; Host names must match rules in case the command template of a
1746 ;; method doesn't use them. 1746 ;; method doesn't use them.
1747 (dolist (m '("su" "sg" "sudo" "doas" "ksu")) 1747 (dolist (m '("su" "sg" "sudo" "doas" "ksu"))
1748 (let (tramp-default-proxies-alist) 1748 (let ((vec (tramp-dissect-file-name tramp-test-temporary-file-directory))
1749 tramp-connection-properties tramp-default-proxies-alist)
1750 (ignore-errors (tramp-cleanup-connection vec nil 'keep-password))
1749 ;; Single hop. The host name must match `tramp-local-host-regexp'. 1751 ;; Single hop. The host name must match `tramp-local-host-regexp'.
1750 (should-error 1752 (should-error
1751 (find-file (format "/%s:foo:" m)) 1753 (find-file (format "/%s:foo:" m))
@@ -1758,9 +1760,7 @@ handled properly. BODY shall not contain a timeout."
1758 (substring (file-remote-p tramp-test-temporary-file-directory) 0 -1) 1760 (substring (file-remote-p tramp-test-temporary-file-directory) 0 -1)
1759 m)) 1761 m))
1760 :type 1762 :type
1761 (if (tramp-method-out-of-band-p 1763 (if (tramp-method-out-of-band-p vec 0) 'file-error 'user-error)))))
1762 (tramp-dissect-file-name tramp-test-temporary-file-directory) 0)
1763 'file-error 'user-error)))))
1764 1764
1765(ert-deftest tramp-test03-file-name-method-rules () 1765(ert-deftest tramp-test03-file-name-method-rules ()
1766 "Check file name rules for some methods." 1766 "Check file name rules for some methods."