[telepathy-gabble/master] Unrace jingle/accept-extra-stream.py

[Will Thompson]

---
 tests/twisted/jingle/accept-extra-stream.py |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/twisted/jingle/accept-extra-stream.py b/tests/twisted/jingle/accept-extra-stream.py
index 4368fa9..3d75ede 100644
--- a/tests/twisted/jingle/accept-extra-stream.py
+++ b/tests/twisted/jingle/accept-extra-stream.py
@@ -137,10 +137,14 @@ def test(q, bus, conn, stream):
     video_handler.StreamState(cs.MEDIA_STREAM_STATE_CONNECTED)
     video_handler.SupportedCodecs(jt2.get_video_codecs_dbus())
 
-    e, _, _ = q.expect_many(
+    e, _, _, _ = q.expect_many(
         # Peer gets the transport
         EventPattern('stream-iq', iq_type='set',
             predicate=lambda e: e.query['action'] =='transport-info'),
+        # Gabble tells the peer we accepted
+        EventPattern('stream-iq', predicate=lambda e:
+            (e.query.name == 'jingle' and
+                e.query['action'] == 'content-accept')),
         EventPattern('dbus-signal', signal='SetStreamPlaying', args=[True]),
         # It's not entirely clear that this *needs* to fire here...
         EventPattern('dbus-signal', signal='SetStreamSending', args=[False]),
@@ -151,9 +155,6 @@ def test(q, bus, conn, stream):
 
     stream.send(make_result_iq(stream, e.stanza))
 
-    q.expect('stream-iq', predicate=lambda e: (e.query.name == 'jingle' and
-                e.query['action'] == 'content-accept'))
-
     # Okay, so now the stream's playing but not sending, and we should be still
     # pending local send:
     streams = sm.ListStreams()
-- 
1.5.6.5