emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master ffc2411: Merge from origin/emacs-28


From: Michael Albinus
Subject: master ffc2411: Merge from origin/emacs-28
Date: Mon, 1 Nov 2021 08:23:47 -0400 (EDT)

branch: master
commit ffc2411a97693ca4e3eb793b7edacb334551c27a
Merge: 8b861b0 84cd95e
Author: Michael Albinus <michael.albinus@gmx.de>
Commit: Michael Albinus <michael.albinus@gmx.de>

    Merge from origin/emacs-28
    
    84cd95e04c Fix bug#51369
---
 test/lisp/net/dbus-tests.el | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/test/lisp/net/dbus-tests.el b/test/lisp/net/dbus-tests.el
index 53c786a..71ca353 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))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]