diff options
Diffstat (limited to 'tests/twisted/test-self-alias.py')
| -rw-r--r-- | tests/twisted/test-self-alias.py | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/tests/twisted/test-self-alias.py b/tests/twisted/test-self-alias.py index 8e6e585..908d256 100644 --- a/tests/twisted/test-self-alias.py +++ b/tests/twisted/test-self-alias.py @@ -11,7 +11,7 @@ def test(q, bus, conn, sip_proxy): conn.Connect() q.expect('dbus-signal', signal='StatusChanged', args=[0, 1]) - self_handle = conn.GetSelfHandle() + self_handle = conn.Get(cs.CONN, 'SelfHandle', dbus_interface=cs.PROPERTIES_IFACE) default_alias = conn.Aliasing.GetAliases([self_handle])[self_handle] @@ -20,7 +20,7 @@ def test(q, bus, conn, sip_proxy): event = q.expect('dbus-signal', signal='AliasesChanged', args=[[(self_handle, u'foo@bar.baz')]]) - handle = conn.RequestHandles(1, ['sip:user@somewhere.com'])[0] + handle = conn.get_contact_handle_sync('sip:user@somewhere.com') assert cs.CONN_IFACE_ALIASING in \ conn.Properties.Get(cs.CONN_IFACE_CONTACTS, "ContactAttributeInterfaces") @@ -29,17 +29,21 @@ def test(q, bus, conn, sip_proxy): assert cs.CONN_IFACE_ALIASING + "/alias" in attrs[self_handle] assert attrs[self_handle][cs.CONN_IFACE_ALIASING + "/alias"] == u'foo@bar.baz' - conn.RequestChannel(cs.CHANNEL_TYPE_TEXT, 1, handle, True) + conn.Requests.CreateChannel( + { cs.CHANNEL_TYPE: cs.CHANNEL_TYPE_TEXT, + cs.TARGET_HANDLE_TYPE: cs.HT_CONTACT, + cs.TARGET_HANDLE: handle }) - event = q.expect('dbus-signal', signal='NewChannel') + event = q.expect('dbus-signal', signal='NewChannels') + path, props = event.args[0][0] - text_iface = dbus.Interface(bus.get_object(conn.bus_name, event.args[0]), + text_iface = dbus.Interface(bus.get_object(conn.bus_name, path), cs.CHANNEL_TYPE_TEXT) text_iface.Send(0, 'Check the display name in From') event = q.expect('sip-message') - self_uri = conn.InspectHandles(1, [self_handle])[0] + self_uri = conn.inspect_contact_sync(self_handle) from_header = event.sip_message.headers['from'][0] assert from_header.startswith('"foo@bar.baz" <' + self_uri + '>'), from_header |