; Instrument entry of tramp--test-instrument-test-case

diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index bb1bafa789fd5db7e46ad48f92e8fb415d3966f4..58639e1bfa6bb304e6c53fabbbfb5ff95ef37ab1 100644 (file)
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -149,6 +149,7 @@ handled properly.  BODY shall not contain a timeout."
         (debug-ignored-errors
          (cons "^make-symbolic-link not supported$" debug-ignored-errors))
         inhibit-message)
+     (message "tramp--test-instrument-test-case %s" tramp-verbose)
      (unwind-protect
         (let ((tramp--test-instrument-test-case-p t)) ,@body)
        ;; Unwind forms.
@@ -3911,8 +3912,8 @@ Since it unloads Tramp, it shall be the last test to run."
     (should-not (cl--find-class 'tramp-file-name))
     (mapatoms
      (lambda (x)
-       (and (string-match "tramp-file-name" (symbol-name x))
-            (functionp x)
+       (and (functionp x)
+            (string-match "tramp-file-name" (symbol-name x))
             (ert-fail (format "Structure function `%s' still exists" x)))))
     ;; There shouldn't be left a hook function containing a Tramp
     ;; function.  We do not regard the Tramp unload hooks.