summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2013-09-23 12:35:54 +0200
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2013-09-23 13:01:39 +0200
commit0a3f85fad87ccbec4d21af1b3b15491449554ea8 (patch)
treec0f5f1ac101cdb77684da239a63d8475c15638c3
parent01e2731c36bb09afabd4c0b9af0e3ca389c9f5ee (diff)
downloadtelepathy-idle-0a3f85fad87ccbec4d21af1b3b15491449554ea8.tar.gz
stop using RequestHandles()
It will be deprecated in Telepathy 1.0
-rw-r--r--tests/twisted/channels/muc-channel-topic.py2
-rw-r--r--tests/twisted/channels/requests-create.py4
-rw-r--r--tests/twisted/contacts.py3
3 files changed, 3 insertions, 6 deletions
diff --git a/tests/twisted/channels/muc-channel-topic.py b/tests/twisted/channels/muc-channel-topic.py
index c460ece..10ddf47 100644
--- a/tests/twisted/channels/muc-channel-topic.py
+++ b/tests/twisted/channels/muc-channel-topic.py
@@ -68,7 +68,7 @@ def test(q, bus, conn, stream):
q.expect('dbus-signal', signal='StatusChanged', args=[0, 1])
- alice_handle, bob_handle = conn.RequestHandles(HT_CONTACT, ['alice', 'bob'])
+ alice_handle, bob_handle = conn.get_contact_handles_sync(['alice', 'bob'])
call_async(q, conn.Requests, 'CreateChannel',
{ CHANNEL_TYPE: CHANNEL_TYPE_TEXT,
diff --git a/tests/twisted/channels/requests-create.py b/tests/twisted/channels/requests-create.py
index 66cf480..957560e 100644
--- a/tests/twisted/channels/requests-create.py
+++ b/tests/twisted/channels/requests-create.py
@@ -20,9 +20,7 @@ def test(q, bus, conn, stream):
assertContains(cs.CONN_IFACE_REQUESTS, props['Interfaces'])
nick = 'foo'
- call_async(q, conn, 'RequestHandles', cs.HT_CONTACT, [nick])
- event = q.expect('dbus-return', method='RequestHandles')
- foo_handle = event.value[0][0]
+ foo_handle = conn.get_contact_handle_sync(nick)
properties = conn.GetAll(cs.CONN_IFACE_REQUESTS,
dbus_interface=cs.PROPERTIES_IFACE)
diff --git a/tests/twisted/contacts.py b/tests/twisted/contacts.py
index 1e83f35..8df602e 100644
--- a/tests/twisted/contacts.py
+++ b/tests/twisted/contacts.py
@@ -18,8 +18,7 @@ def test(q, bus, conn, stream):
assertContains(cs.CONN_IFACE_ALIASING, attr_ifaces)
assertContains(cs.CONN_IFACE_CONTACT_INFO, attr_ifaces)
- brillana, miriam = conn.RequestHandles(cs.HT_CONTACT,
- ["brillana", "miriam"])
+ brillana, miriam = conn.get_contact_handles_sync(["brillana", "miriam"])
# First up, check that contact-id is always present
attrs = conn.Contacts.GetContactAttributes([brillana], [], True)