From ec65b9adbeffe8f9b568a79a694ce681d2519a1a Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Sun, 1 Dec 2019 12:25:15 +0100 Subject: [PATCH] Suppress superfluous messages in tramp-tests * test/lisp/net/tramp-tests.el (tramp-test10-write-region) (tramp-test10-write-region-file-precious-flag) (tramp-test34-connection-local-variables) (tramp-test36-vc-registered): Let-bind `inhibit-message'. --- lisp/net/tramp-compat.el | 5 +++++ test/lisp/net/tramp-archive-tests.el | 4 ++-- test/lisp/net/tramp-tests.el | 6 +++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el index 1c414372207..36403997b3b 100644 --- a/lisp/net/tramp-compat.el +++ b/lisp/net/tramp-compat.el @@ -327,6 +327,11 @@ A nil value for either argument stands for the current time." (unload-feature 'tramp-loaddefs 'force) (unload-feature 'tramp-compat 'force))) +;;; TODO: +;; +;; * Starting with Emacs 25.1, replace `tramp-message-show-message' by +;; the reverse of `inhibit-message'. + (provide 'tramp-compat) ;;; tramp-compat.el ends here diff --git a/test/lisp/net/tramp-archive-tests.el b/test/lisp/net/tramp-archive-tests.el index 80bc9ccaae2..7de9589e895 100644 --- a/test/lisp/net/tramp-archive-tests.el +++ b/test/lisp/net/tramp-archive-tests.el @@ -58,11 +58,11 @@ "A directory file name, which looks like an archive.") (setq password-cache-expiry nil - tramp-verbose 0 tramp-cache-read-persistent-data t ;; For auth-sources. tramp-copy-size-limit nil tramp-message-show-message nil - tramp-persistency-file-name nil) + tramp-persistency-file-name nil + tramp-verbose 0) (defun tramp-archive--test-make-temp-name () "Return a temporary file name for test. diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index 9b1af1b28bc..09ba928c892 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el @@ -2233,7 +2233,8 @@ This checks also `file-name-as-directory', `file-name-directory', (skip-unless (tramp--test-enabled)) (dolist (quoted (if (tramp--test-expensive-test) '(nil t) '(nil))) - (let ((tmp-name (tramp--test-make-temp-name nil quoted))) + (let ((tmp-name (tramp--test-make-temp-name nil quoted)) + (inhibit-message t)) (unwind-protect (progn ;; Write buffer. Use absolute and relative file name. @@ -2332,6 +2333,7 @@ This checks also `file-name-as-directory', `file-name-directory', (skip-unless (tramp--test-emacs27-p)) (let* ((tmp-name (tramp--test-make-temp-name)) + (inhibit-message t) written-files (advice (lambda (_start _end filename &rest _r) (push filename written-files)))) @@ -4566,6 +4568,7 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." (tmp-name2 (expand-file-name "foo" tmp-name1)) (enable-local-variables :all) (enable-remote-dir-locals t) + (inhibit-message t) kill-buffer-query-functions connection-local-profile-alist connection-local-criteria-alist) (unwind-protect @@ -4797,6 +4800,7 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." (tmp-name1 (tramp--test-make-temp-name nil quoted)) (tmp-name2 (expand-file-name "foo" tmp-name1)) (tramp-remote-process-environment tramp-remote-process-environment) + (inhibit-message t) (vc-handled-backends (with-parsed-tramp-file-name tramp-test-temporary-file-directory nil (cond -- 2.39.2