summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2013-10-09 20:41:56 (GMT)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2013-10-11 21:55:06 (GMT)
commit4f7830a1aea32c1aacbfa45cea2fae573e02a507 (patch)
treea99c6a0ae3c7fa2f99728e05fc5ab7b9bc890048
parenta3266dab8044470dcbca6777d9dfc5070b616f1b (diff)
downloadtelepathy-gabble-4f7830a1aea32c1aacbfa45cea2fae573e02a507.tar.gz
telepathy-gabble-4f7830a1aea32c1aacbfa45cea2fae573e02a507.tar.xz
stop using GetAliases()
-rw-r--r--tests/twisted/roster/test-save-alias-to-roster.py3
-rw-r--r--tests/twisted/vcard/test-alias-message.py6
2 files changed, 7 insertions, 2 deletions
diff --git a/tests/twisted/roster/test-save-alias-to-roster.py b/tests/twisted/roster/test-save-alias-to-roster.py
index f8c0c2a..0f67da0 100644
--- a/tests/twisted/roster/test-save-alias-to-roster.py
+++ b/tests/twisted/roster/test-save-alias-to-roster.py
@@ -91,7 +91,8 @@ def test(q, bus, conn, stream):
q.expect('dbus-signal', signal='MembersChangedDetailed')
# But if we ask for it, Gabble should probably send a PEP query.
- assertEquals(jid, conn.Aliasing.GetAliases([handle])[handle])
+ h2asv = conn.Contacts.GetContactAttributes([handle], [cs.CONN_IFACE_ALIASING], False)
+ assertEquals(jid, h2asv[handle][cs.ATTR_ALIAS])
event = q.expect('stream-iq', iq_type='get', query_ns=ns.PUBSUB, to=jid)
nick = 'Constant Future'
diff --git a/tests/twisted/vcard/test-alias-message.py b/tests/twisted/vcard/test-alias-message.py
index 39c9b27..07f889b 100644
--- a/tests/twisted/vcard/test-alias-message.py
+++ b/tests/twisted/vcard/test-alias-message.py
@@ -15,7 +15,11 @@ import constants as cs
import ns
def get_aliases(conn, contacts):
- return conn.Aliasing.GetAliases(contacts)
+ h2asv = conn.Contacts.GetContactAttributes(contacts, [cs.CONN_IFACE_ALIASING], False)
+ ret = {}
+ for h in contacts:
+ ret[h] = h2asv[h][cs.ATTR_ALIAS]
+ return ret
def test(q, bus, conn, stream):
expect_and_handle_get_vcard(q, stream)