[Telepathy-commits] [telepathy-salut/master] test-two-muc-stream-tubes.py: use wait_for_contact_list

Guillaume Desmottes guillaume.desmottes at collabora.co.uk
Mon Dec 22 04:57:16 PST 2008


---
 tests/twisted/avahi/test-two-muc-stream-tubes.py |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/tests/twisted/avahi/test-two-muc-stream-tubes.py b/tests/twisted/avahi/test-two-muc-stream-tubes.py
index a63b7ab..54e600f 100644
--- a/tests/twisted/avahi/test-two-muc-stream-tubes.py
+++ b/tests/twisted/avahi/test-two-muc-stream-tubes.py
@@ -1,4 +1,4 @@
-from saluttest import exec_test, make_connection
+from saluttest import exec_test, make_connection, wait_for_contact_list
 from avahitest import AvahiAnnouncer, AvahiListener
 from avahitest import get_host_name
 import avahi
@@ -86,12 +86,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', path=conn.object_path)
-    # subscribe
-    q.expect('dbus-signal', signal='NewChannel', path=conn.object_path)
-    # known
-    q.expect('dbus-signal', signal='NewChannel', path=conn.object_path)
+    wait_for_contact_list(q, conn)
 
     # second connection: connect
     conn2_params = {
-- 
1.5.6.5




More information about the Telepathy-commits mailing list