From: Michael Albinus <michael.albinus@gmx.de>
Date: Mon, 1 Nov 2021 12:22:28 +0000 (+0100)
Subject: Fix bug#51369
X-Git-Tag: emacs-28.0.90~140
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=84cd95e04c77d9cf15fa04c46d5a961a94ab524d;p=emacs.git

Fix bug#51369

* test/lisp/net/dbus-tests.el (dbus-test04-register-method): Skip on hydra.
---

diff --git a/test/lisp/net/dbus-tests.el b/test/lisp/net/dbus-tests.el
index 53c786ada48..71ca3537972 100644
--- a/test/lisp/net/dbus-tests.el
+++ b/test/lisp/net/dbus-tests.el
@@ -630,16 +630,19 @@ This includes initialization and closing the bus."
             :session dbus--test-service dbus--test-path
             dbus--test-interface method1 "foo" "bar"))
           `(dbus-error ,dbus-error-invalid-args "Wrong arguments (foo bar)")))
-        ;; Three arguments, D-Bus error activated by `dbus-error' signal.
-        (should
-         (equal
-          (should-error
-           (dbus-call-method
-            :session dbus--test-service dbus--test-path
-            dbus--test-interface method1 "foo" "bar" "baz"))
-          `(dbus-error
-            ,dbus-error-failed
-            "D-Bus error: \"D-Bus signal\", \"foo\", \"bar\", \"baz\"")))
+        ;; Three arguments, D-Bus error activated by `dbus-error'
+        ;; signal.  On hydra, it is not guaranteed which format the
+        ;; error message arises.  (Bug#51369)
+        (unless (getenv "EMACS_HYDRA_CI")
+          (should
+           (equal
+            (should-error
+             (dbus-call-method
+              :session dbus--test-service dbus--test-path
+              dbus--test-interface method1 "foo" "bar" "baz"))
+            `(dbus-error
+              ,dbus-error-failed
+              "D-Bus error: \"D-Bus signal\", \"foo\", \"bar\", \"baz\""))))
 
         ;; Unregister method.
         (should (dbus-unregister-object registered))