Handle `write-region' messages in Tramp properly

* lisp/net/tramp.el (tramp-handle-write-region-message): New defsubst.
* lisp/net/tramp-adb.el (tramp-adb-handle-write-region):
* lisp/net/tramp-gvfs.el (tramp-gvfs-handle-write-region):
* lisp/net/tramp-sh.el (tramp-sh-handle-write-region):
* lisp/net/tramp-smb.el (tramp-smb-handle-write-region): Use it.

* lisp/net/tramp.el (tramp-password-prompt-regexp)
(tramp-completion-mode-p):
* lisp/net/tramp-cmds.el (tramp-reporter-dump-variable)
(tramp-append-tramp-buffers):
* lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection):
Use `bound-and-true-p'.

* lisp/net/tramp-compat.el (tramp-compat-delete-file):
Don't check for `boundp' anymore.

* test/lisp/net/tramp-tests.el (ert-x): Require it.
(tramp--test-messages): New defvar.
(tramp-test10-write-region): Extend test.

1 files changed, 52 insertions, 2 deletions

diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 8db54979b6d..742bdfd9348 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -39,6 +39,7 @@
 
 (require 'dired)
 (require 'ert)
+(require 'ert-x)
 (require 'tramp)
 (require 'vc)
 (require 'vc-bzr)
@@ -80,6 +81,9 @@
 (when (getenv "NIX_STORE")
   (add-to-list 'tramp-remote-path 'tramp-own-remote-path))
 
+(defvar tramp--test-messages nil
+  "Captured messages from *Messages* buffer.")
+
 (defvar tramp--test-expensive-test
   (null
    (string-equal (getenv "SELECTOR") "(quote (not (tag :expensive-test)))"))
@@ -1741,31 +1745,77 @@ 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))
+           (text-quoting-style 'grave)
+           (write-region-verbose
+            (and (null noninteractive) (boundp 'write-region-verbose)))
+           (tramp-message-show-message
+            (or tramp-message-show-message write-region-verbose)))
       (unwind-protect
-          (progn
+          (ert-with-message-capture tramp--test-messages
+            ;; Write buffer.
+            (setq tramp--test-messages "")
             (with-temp-buffer
               (insert "foo")
               (write-region nil nil tmp-name))
+            (when write-region-verbose
+              (should
+               (string-match
+                (format "Wrote `%s' (3 characters)" tmp-name)
+                tramp--test-messages)))
             (with-temp-buffer
               (insert-file-contents tmp-name)
               (should (string-equal (buffer-string) "foo")))
+
             ;; Append.
+            (setq tramp--test-messages "")
             (with-temp-buffer
               (insert "bla")
               (write-region nil nil tmp-name 'append))
+            (when write-region-verbose
+              (should
+               (string-match
+                (format "Added to `%s' (3 characters)" tmp-name)
+                tramp--test-messages)))
             (with-temp-buffer
               (insert-file-contents tmp-name)
               (should (string-equal (buffer-string) "foobla")))
+
+            (setq tramp--test-messages "")
+            (with-temp-buffer
+              (insert "baz")
+              (write-region nil nil tmp-name 3))
+            (when write-region-verbose
+              (should
+               (string-match
+                (format "Updated `%s' (3 characters)" tmp-name)
+                tramp--test-messages)))
+            (with-temp-buffer
+              (insert-file-contents tmp-name)
+              (should (string-equal (buffer-string) "foobaz")))
+
             ;; Write string.
+            (setq tramp--test-messages "")
             (write-region "foo" nil tmp-name)
+            (when write-region-verbose
+              (should
+               (string-match
+                (format "Wrote `%s' (3 characters)" tmp-name)
+                tramp--test-messages)))
             (with-temp-buffer
               (insert-file-contents tmp-name)
               (should (string-equal (buffer-string) "foo")))
+
             ;; Write partly.
+            (setq tramp--test-messages "")
             (with-temp-buffer
               (insert "123456789")
               (write-region 3 5 tmp-name))
+            (when write-region-verbose
+              (should
+               (string-match
+                (format "Wrote `%s' (2 characters)" tmp-name)
+                tramp--test-messages)))
             (with-temp-buffer
               (insert-file-contents tmp-name)
               (should (string-equal (buffer-string) "34"))))