diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-24 18:43:00 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-27 15:40:40 +0000 |
| commit | 522827c3ae546be8f16f3078a5279c51bf2f8453 (patch) | |
| tree | 05b77992cd2ffeabe0ab9e7ad136205b702e1c52 | |
| parent | ea79d98b4c3d859880d9e41633826b12f8339b2e (diff) | |
sync_dbus: support being called on a CM, too
| -rw-r--r-- | tests/twisted/servicetest.py | 6 |
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) |