[Emacs-diffs] emacs-24 r117320: * automated/dbus-tests.el (dbus--test-register-service)

[Michael Albinus]

------------------------------------------------------------
revno: 117320
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/17858
committer: Michael Albinus <address@hidden>
branch nick: emacs-24
timestamp: Fri 2014-06-27 20:20:21 +0200
message:
  * automated/dbus-tests.el (dbus--test-register-service)
  (dbus-test02-register-service-session): Replace `dbus-ping' calls
  by `dbus-list-known-names'.
modified:
  test/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-8588
  test/automated/dbus-tests.el   dbustests.el-20131205152340-sqj03az681hmq6pu-1

=== modified file 'test/ChangeLog'
--- a/test/ChangeLog    2014-06-25 21:59:28 +0000
+++ b/test/ChangeLog    2014-06-27 18:20:21 +0000
@@ -1,3 +1,9 @@
+2014-06-27  Michael Albinus  <address@hidden>
+
+       * automated/dbus-tests.el (dbus--test-register-service)
+       (dbus-test02-register-service-session): Replace `dbus-ping' calls
+       by `dbus-list-known-names'.  (Bug#17858)
+
 2014-06-25  Stefan Monnier  <address@hidden>
 
        * automated/package-test.el (package-test-update-listing)

=== modified file 'test/automated/dbus-tests.el'
--- a/test/automated/dbus-tests.el      2014-01-01 07:43:34 +0000
+++ b/test/automated/dbus-tests.el      2014-06-27 18:20:21 +0000
@@ -88,15 +88,15 @@
 
   ;; Register an own service.
   (should (eq (dbus-register-service bus dbus-service-emacs) :primary-owner))
-  (should (dbus-ping bus dbus-service-emacs 100))
+  (should (member dbus-service-emacs (dbus-list-known-names bus)))
   (should (eq (dbus-register-service bus dbus-service-emacs) :already-owner))
-  (should (dbus-ping bus dbus-service-emacs 100))
+  (should (member dbus-service-emacs (dbus-list-known-names bus)))
 
   ;; Unregister the service.
   (should (eq (dbus-unregister-service bus dbus-service-emacs) :released))
-  (should-not (dbus-ping bus dbus-service-emacs 100))
+  (should-not (member dbus-service-emacs (dbus-list-known-names bus)))
   (should (eq (dbus-unregister-service bus dbus-service-emacs) :non-existent))
-  (should-not (dbus-ping bus dbus-service-emacs 100))
+  (should-not (member dbus-service-emacs (dbus-list-known-names bus)))
 
   ;; `dbus-service-dbus' is reserved for the BUS itself.
   (should-error (dbus-register-service bus dbus-service-dbus))
@@ -109,7 +109,7 @@
   (dbus--test-register-service :session)
 
   (let ((service "org.freedesktop.Notifications"))
-    (when (dbus-ping :session service 100)
+    (when (member service (dbus-list-known-names :session))
       ;; Cleanup.
       (dbus-ignore-errors (dbus-unregister-service :session service))