Merge remote-tracking branch 'origin/master' into feature/pgtk

4 files changed, 8 insertions, 8 deletions

diff --git a/test/lisp/emacs-lisp/bytecomp-tests.el b/test/lisp/emacs-lisp/bytecomp-tests.el
index b82afd353cf..7e51f820b70 100644
--- a/test/lisp/emacs-lisp/bytecomp-tests.el
+++ b/test/lisp/emacs-lisp/bytecomp-tests.el
@@ -851,8 +851,7 @@ byte-compiled.  Run with dynamic binding."
        (byte-compile-file ,(ert-resource-file file))
        (ert-info ((buffer-string) :prefix "buffer: ")
          (,(if reverse 'should-not 'should)
-          (re-search-forward ,(string-replace " " "[ \n]+" re-warning)
-                             nil t))))))
+          (re-search-forward ,re-warning nil t))))))
 
 (bytecomp--define-warning-file-test "error-lexical-var-with-add-hook.el"
                             "add-hook.*lexical var")
@@ -980,7 +979,7 @@ byte-compiled.  Run with dynamic binding."
 
 (bytecomp--define-warning-file-test
  "warn-wide-docstring-defun.el"
- "wider than .* characters")
+ "Warning: docstring wider than .* characters")
 
 (bytecomp--define-warning-file-test
  "warn-wide-docstring-defvar.el"
diff --git a/test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el b/test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el
index ee52d831d69..e881e46a2d1 100644
--- a/test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el
+++ b/test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el
@@ -325,6 +325,7 @@
   ())
 
 (with-suppressed-warnings ((obsolete defmethod)
+                           (obsolete defgeneric)
                            (obsolete next-method-p)
                            (obsolete call-next-method))
   (defmethod initialize-instance :after ((_this eitest-Jb) &rest _slots)
diff --git a/test/lisp/mail/mail-utils-tests.el b/test/lisp/mail/mail-utils-tests.el
index 5b54f2440c7..f75de5c620c 100644
--- a/test/lisp/mail/mail-utils-tests.el
+++ b/test/lisp/mail/mail-utils-tests.el
@@ -85,7 +85,8 @@
                  "foo@example.org\\|bar@example.org\\|baz@example.org")))
 
 (ert-deftest mail-utils-tests-mail-rfc822-time-zone ()
-  (should (stringp (mail-rfc822-time-zone (current-time)))))
+  (with-suppressed-warnings ((obsolete mail-rfc822-time-zone))
+    (should (stringp (mail-rfc822-time-zone (current-time))))))
 
 (ert-deftest mail-utils-test-mail-rfc822-date/contains-year ()
   (should (string-match (rx " 20" digit digit " ")
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index c047f666dae..a572ff83d3f 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -219,8 +219,7 @@ is greater than 10.
        (when (and (null tramp--test-instrument-test-case-p) (> tramp-verbose 3))
          (untrace-all)
          (dolist (buf (tramp-list-tramp-buffers))
-           (with-current-buffer buf
-             (message ";; %s\n%s" buf (buffer-string)))
+           (message ";; %s\n%s" buf (tramp-get-buffer-string buf))
            (kill-buffer buf))))))
 
 (defsubst tramp--test-message (fmt-string &rest arguments)
@@ -5054,8 +5053,8 @@ INPUT, if non-nil, is a string sent to the process."
                    "echo foo >&2; echo bar" (current-buffer) stderr)
                   (should (string-equal "bar\n" (buffer-string)))
                   ;; Check stderr.
-                  (with-current-buffer stderr
-                    (should (string-equal "foo\n" (buffer-string)))))
+                  (should
+                   (string-equal "foo\n" (tramp-get-buffer-string stderr))))
 
               ;; Cleanup.
               (ignore-errors (kill-buffer stderr))))))