[next] telepathy-mission-control: sync_dbus: support being called on a CM, too
Simon McVittie
smcv at kemper.freedesktop.org
Thu Apr 3 07:28:04 PDT 2014
Module: telepathy-mission-control
Branch: next
Commit: 522827c3ae546be8f16f3078a5279c51bf2f8453
URL: http://cgit.freedesktop.org/telepathy/telepathy-mission-control/commit/?id=522827c3ae546be8f16f3078a5279c51bf2f8453
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date: Mon Mar 24 18:43:00 2014 +0000
sync_dbus: support being called on a CM, too
---
tests/twisted/servicetest.py | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/tests/twisted/servicetest.py b/tests/twisted/servicetest.py
index 5af4b09..0902b55 100644
--- a/tests/twisted/servicetest.py
+++ b/tests/twisted/servicetest.py
@@ -595,6 +595,12 @@ def sync_dbus(bus, q, proxy):
call_async(q, dbus.Interface(proxy, cs.PROPERTIES_IFACE),
'Get', cs.CONN, 'Status')
q.expect('dbus-return', method='Get')
+ elif proxy.object_path.startswith('/' + cs.CM.replace('.', '/') + '/'):
+ # It could be a ConnectionManager or a Protocol. Assume it's a
+ # ConnectionManager for now
+ call_async(q, dbus.Interface(proxy, cs.PROPERTIES_IFACE),
+ 'Get', cs.CM, 'Protocols')
+ q.expect('dbus-return', method='Get')
else:
raise AssertionError("don't know how to sync %s" % proxy.object_path)
More information about the telepathy-commits
mailing list