diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-10-02 13:40:27 +0200 |
|---|---|---|
| committer | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2013-10-04 11:05:33 -0400 |
| commit | 6ba57d285b3da1f2e48c4ae292ece94aec297080 (patch) | |
| tree | f66b8eaf554de6371e1a0d3c92aebeb7fc0c07d2 | |
| parent | 7b23f4198aac89284a7b90a4d56fb49f0c9f109e (diff) | |
servicetest: sync with MC next
https://bugs.freedesktop.org/show_bug.cgi?id=69964
| -rw-r--r-- | tests/twisted/servicetest.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/tests/twisted/servicetest.py b/tests/twisted/servicetest.py index fef89d1..1363802 100644 --- a/tests/twisted/servicetest.py +++ b/tests/twisted/servicetest.py @@ -575,8 +575,7 @@ def sync_dbus(bus, q, proxy): # dbus-glib and thence the application, which means that Ping()ing the # application doesn't ensure that it's processed all D-Bus messages prior # to our ping. - call_async(q, dbus.Interface(proxy, 'im.telepathy1.Tests'), - 'DummySyncDBus') + call_async(q, dbus.Interface(proxy, cs.TESTS), 'DummySyncDBus') q.expect('dbus-error', method='DummySyncDBus') class ProxyWrapper: @@ -604,7 +603,7 @@ class ConnWrapper(ProxyWrapper): return self.inspect_contacts_sync([handle])[0] def inspect_contacts_sync(self, handles): - h2asv = self.Contacts.GetContactAttributes(handles, [], True) + h2asv = self.Contacts.GetContactAttributes(handles, []) ret = [] for h in handles: ret.append(h2asv[h][cs.ATTR_CONTACT_ID]) @@ -618,14 +617,16 @@ class ConnWrapper(ProxyWrapper): def wrap_connection(conn): return ConnWrapper(conn, tp_name_prefix + '.Connection', - dict([ - (name, tp_name_prefix + '.Connection.Interface.' + name) - for name in ['Aliasing', 'Avatars', 'Capabilities', 'Contacts', - 'SimplePresence', 'Requests']] + + dict( [('Peer', 'org.freedesktop.DBus.Peer'), + ('Aliasing', cs.CONN_IFACE_ALIASING), + ('Avatars', cs.CONN_IFACE_AVATARS), + ('Contacts', cs.CONN_IFACE_CONTACTS), ('ContactCapabilities', cs.CONN_IFACE_CONTACT_CAPS), ('ContactInfo', cs.CONN_IFACE_CONTACT_INFO), ('Location', cs.CONN_IFACE_LOCATION), + ('Presence', cs.CONN_IFACE_PRESENCE), + ('Requests', cs.CONN_IFACE_REQUESTS), ('Future', tp_name_prefix + '.Connection.FUTURE'), ('MailNotification', cs.CONN_IFACE_MAIL_NOTIFICATION), ('ContactList', cs.CONN_IFACE_CONTACT_LIST), @@ -637,7 +638,7 @@ def wrap_connection(conn): def wrap_channel(chan, type_, extra=None): interfaces = { type_: tp_name_prefix + '.Channel.Type.' + type_, - 'Group': tp_name_prefix + '.Channel.Interface.Group', + 'Group': cs.CHANNEL_IFACE_GROUP, } if extra: |