From 0bb2d9bbf532caba9fe040c125417b23bc2999e5 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Thu, 3 Oct 2013 14:27:39 +0200 Subject: [PATCH 1/8] stop using RequestHandles() for contacts --- tests/twisted/muc/name-conflict.py | 4 ++-- tests/twisted/muc/test-muc-ownership.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/twisted/muc/name-conflict.py b/tests/twisted/muc/name-conflict.py index e476fd7..2aee8d2 100644 --- a/tests/twisted/muc/name-conflict.py +++ b/tests/twisted/muc/name-conflict.py @@ -184,8 +184,8 @@ def test_gtalk_weirdness(q, bus, conn, stream, room_jid): # resources of the same contact. There is no race between this method # returning and MembersChangedDetailed firing, because libdbus reorders # messages when you make blocking calls. - handle, handle_, handle__, foobar_handle = conn.RequestHandles( - cs.HT_CONTACT, jids + ['%s/foobar_gmail.com' % room_jid]) + handle, handle_, handle__, foobar_handle = conn.get_contact_handles_sync( + jids + ['%s/foobar_gmail.com' % room_jid]) q.expect('dbus-signal', signal='MembersChangedDetailed', predicate=lambda e: e.args[0:4] == [[foobar_handle], [], [], []]) diff --git a/tests/twisted/muc/test-muc-ownership.py b/tests/twisted/muc/test-muc-ownership.py index fae3046..655e93f 100644 --- a/tests/twisted/muc/test-muc-ownership.py +++ b/tests/twisted/muc/test-muc-ownership.py @@ -62,7 +62,7 @@ def test(q, bus, conn, stream): added = event.args[1] [test, bob, brian, che, che_owner, chris, chris_owner] = \ - conn.RequestHandles(cs.HT_CONTACT, + conn.get_contact_handles_sync( [ 'chat@conf.localhost/test', 'chat@conf.localhost/bob', 'chat@conf.localhost/brian', 'chat@conf.localhost/che', 'che@foo.com', 'chat@conf.localhost/chris', 'chris@foo.com', -- 1.8.3.1