From: Michael Albinus <michael.albinus@gmx.de>
Date: Sat, 6 Nov 2021 16:25:19 +0000 (+0100)
Subject: Fix dbus-test04-register-method on CentOS (Bug#51369)
X-Git-Tag: emacs-28.0.90~112
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5e9b4e70ab;p=emacs.git

Fix dbus-test04-register-method on CentOS (Bug#51369)

* test/lisp/net/dbus-tests.el (dbus-test04-register-method):
Fix problem on CentOS.  (Bug#51369)
---

diff --git a/test/lisp/net/dbus-tests.el b/test/lisp/net/dbus-tests.el
index 71ca3537972..cfc380d3029 100644
--- a/test/lisp/net/dbus-tests.el
+++ b/test/lisp/net/dbus-tests.el
@@ -631,18 +631,18 @@ This includes initialization and closing the bus."
             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.  On hydra, it is not guaranteed which format the
+        ;; signal.  On CentOS, 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\""))))
+        (should
+         (member
+          (should-error
+           (dbus-call-method
+            :session dbus--test-service dbus--test-path
+            dbus--test-interface method1 "foo" "bar" "baz"))
+          `((dbus-error "D-Bus signal" "foo" "bar" "baz")
+            (dbus-error
+             ,dbus-error-failed
+             "D-Bus error: \"D-Bus signal\", \"foo\", \"bar\", \"baz\""))))
 
         ;; Unregister method.
         (should (dbus-unregister-object registered))