[telepathy-mission-control/master] servicetest.sync_dbus: allow to be called on any D-Bus object

Simon McVittie simon.mcvittie at collabora.co.uk
Wed Apr 1 09:22:31 PDT 2009


---
 test/twisted/servicetest.py |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/test/twisted/servicetest.py b/test/twisted/servicetest.py
index 2a32cb8..20036c8 100644
--- a/test/twisted/servicetest.py
+++ b/test/twisted/servicetest.py
@@ -443,11 +443,10 @@ def call_async(test, proxy, method, *args, **kw):
     kw.update({'reply_handler': reply_func, 'error_handler': error_func})
     method_proxy(*args, **kw)
 
-def sync_dbus(bus, q, conn):
+def sync_dbus(bus, q, proxy):
     # Dummy D-Bus method call
-    call_async(q, conn, "InspectHandles", 1, [])
-
-    event = q.expect('dbus-return', method='InspectHandles')
+    call_async(q, dbus.Interface(proxy, dbus.PEER_IFACE), "Ping")
+    event = q.expect('dbus-return', method='Ping')
 
 class ProxyWrapper:
     def __init__(self, object, default, others):
-- 
1.5.6.5




More information about the telepathy-commits mailing list