[Telepathy-commits] [telepathy-gabble/master] test-muc-accept-stream-tube-ibb.py: fix a race

[Simon McVittie]

Previously we assumed that the Tubes channel would always be
signalled before the Text one. With telepathy-glib 0.7.18 this is
no longer true.
---
 .../tubes/test-muc-accept-stream-tube-ibb.py       |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/tests/twisted/tubes/test-muc-accept-stream-tube-ibb.py b/tests/twisted/tubes/test-muc-accept-stream-tube-ibb.py
index 04088c0..7953001 100644
--- a/tests/twisted/tubes/test-muc-accept-stream-tube-ibb.py
+++ b/tests/twisted/tubes/test-muc-accept-stream-tube-ibb.py
@@ -119,7 +119,13 @@ def test(q, bus, conn, stream):
 
     # tubes channel is automatically created
     event = q.expect('dbus-signal', signal='NewChannel')
-    assert event.args[1] == 'org.freedesktop.Telepathy.Channel.Type.Tubes'
+
+    if event.args[1] == 'org.freedesktop.Telepathy.Channel.Type.Text':
+        # skip this one, try the next one
+        event = q.expect('dbus-signal', signal='NewChannel')
+
+    assert event.args[1] == 'org.freedesktop.Telepathy.Channel.Type.Tubes',\
+        event.args
     assert event.args[2] == 2 # Handle_Type_Room
     assert event.args[3] == room_handle
 
-- 
1.5.6.5