[Telepathy-commits] [telepathy-salut/master] test-request-muc-tubes: use wait_for_contact_list
Guillaume Desmottes
guillaume.desmottes at collabora.co.uk
Mon Dec 22 04:53:40 PST 2008
---
tests/twisted/avahi/test-request-muc-tubes.py | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/tests/twisted/avahi/test-request-muc-tubes.py b/tests/twisted/avahi/test-request-muc-tubes.py
index b61aeef..85cfa63 100644
--- a/tests/twisted/avahi/test-request-muc-tubes.py
+++ b/tests/twisted/avahi/test-request-muc-tubes.py
@@ -8,7 +8,7 @@ import avahitest
from twisted.words.xish import domish
-from saluttest import exec_test
+from saluttest import exec_test, wait_for_contact_list
from servicetest import call_async, lazy, match, EventPattern, \
tp_name_prefix, tp_path_prefix, make_channel_proxy
@@ -26,12 +26,7 @@ def test(q, bus, conn):
# FIXME: this is a hack to be sure to have all the contact list channels
# announced so they won't interfere with the muc ones announces.
- # publish
- q.expect('dbus-signal', signal='NewChannel')
- # subscribe
- q.expect('dbus-signal', signal='NewChannel')
- # known
- q.expect('dbus-signal', signal='NewChannel')
+ wait_for_contact_list(q, conn)
# check if we can request roomlist channels
properties = conn.GetAll(
--
1.5.6.5
More information about the Telepathy-commits
mailing list