[Telepathy-commits] [telepathy-salut/master] test-roomlist: use wait_for_contact_list

[Guillaume Desmottes]

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

diff --git a/tests/twisted/avahi/test-roomlist.py b/tests/twisted/avahi/test-roomlist.py
index 488735a..b83daf3 100644
--- a/tests/twisted/avahi/test-roomlist.py
+++ b/tests/twisted/avahi/test-roomlist.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
 
@@ -23,12 +23,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 roomlist 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