[Telepathy-commits] [telepathy-gabble/master] test-get-available-tubes.py: check that the tubes and text channels are announced together

[Guillaume Desmottes]

---
 tests/twisted/tubes/test-get-available-tubes.py |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/tests/twisted/tubes/test-get-available-tubes.py b/tests/twisted/tubes/test-get-available-tubes.py
index c3808c3..0e86114 100644
--- a/tests/twisted/tubes/test-get-available-tubes.py
+++ b/tests/twisted/tubes/test-get-available-tubes.py
@@ -72,15 +72,19 @@ def test(q, bus, conn, stream):
     item['role'] = 'participant'
     stream.send(presence)
 
-    q.expect('dbus-signal', signal='MembersChanged',
-            args=[u'', [2, 3], [], [], [], 0, 0])
+    new_chans, members, event = q.expect_many(
+        EventPattern('dbus-signal', signal='NewChannels'),
+        EventPattern('dbus-signal', signal='MembersChanged',
+            args=[u'', [2, 3], [], [], [], 0, 0]),
+        EventPattern('dbus-return', method='RequestChannel'))
+
+    channels = new_chans.args[0]
+    assert len(channels) == 2
 
     assert conn.InspectHandles(1, [2]) == ['chat at conf.localhost/test']
     assert conn.InspectHandles(1, [3]) == ['chat at conf.localhost/bob']
     bob_handle = 3
 
-    event = q.expect('dbus-return', method='RequestChannel')
-
     tubes_chan = bus.get_object(conn.bus_name, event.value[0])
     tubes_iface_muc = dbus.Interface(tubes_chan,
             tp_name_prefix + '.Channel.Type.Tubes')
-- 
1.5.6.5