emacs-diffs
[Top][All Lists]
Advanced

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

emacs-28 5e9b4e7: Fix dbus-test04-register-method on CentOS (Bug#51369)


From: Michael Albinus
Subject: emacs-28 5e9b4e7: Fix dbus-test04-register-method on CentOS (Bug#51369)
Date: Sat, 6 Nov 2021 12:25:26 -0400 (EDT)

branch: emacs-28
commit 5e9b4e70ab433fe2eb33c20a02b045c83e70d074
Author: Michael Albinus <michael.albinus@gmx.de>
Commit: Michael Albinus <michael.albinus@gmx.de>

    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)
---
 test/lisp/net/dbus-tests.el | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

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



reply via email to

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