summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2014-03-24 18:42:46 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2014-03-24 18:42:46 +0000
commitad7547cc4c83c6475c10c3e3a585d3c6bc3ab576 (patch)
treeb2b37b66e2bd816d9565e8796b1d8eb716686045
parent509682f80a1c9d3b7925075de21961cd1e62234b (diff)
sync_dbus: support being called on a CM, toonext-gdbus
-rw-r--r--tests/twisted/servicetest.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/twisted/servicetest.py b/tests/twisted/servicetest.py
index 5af4b094..0902b55d 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)