From: Michael Albinus <michael.albinus@gmx.de>
Date: Thu, 30 Nov 2017 19:31:33 +0000 (+0100)
Subject: Make tramp-test42-auto-load more robust
X-Git-Tag: emacs-26.0.91~219
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ad99550;p=emacs.git

Make tramp-test42-auto-load more robust

* test/lisp/net/tramp-tests.el (tramp-test42-auto-load):
Make it more robust.  Don't skip.
---

diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 8a551db7785..b0fe3f83e97 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -4613,15 +4613,13 @@ process sentinels.  They shall not disturb each other."
         (ignore-errors (cancel-timer timer))
         (ignore-errors (delete-directory tmp-name 'recursive))))))
 
+;; This test is inspired by Bug#29163.
 (ert-deftest tramp-test42-auto-load ()
   "Check that Tramp autoloads properly."
-  (skip-unless (tramp--test-enabled))
-  (skip-unless (not (tramp--test-mock-p)))
-
   (let ((default-directory (expand-file-name temporary-file-directory))
 	(code
 	 (format
-	  "(message \"Tramp loaded: %%s\" (consp (file-attributes %S)))"
+	  "(message \"Tramp loaded: %%s\" (and (file-remote-p %S) t))"
 	  tramp-test-temporary-file-directory)))
     (should
      (string-match