From 3288b4295f3b96e44b625c89ea4b3985eb52de29 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 30 May 2013 17:31:56 +0100 Subject: [PATCH 1/4] Update Wocky for fd.o #65131, and test it --- lib/ext/wocky | 2 +- tests/twisted/jingle/incoming-gmail-modern-jingle.py | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/ext/wocky b/lib/ext/wocky index d6c9956..8e5d181 160000 --- a/lib/ext/wocky +++ b/lib/ext/wocky @@ -1 +1 @@ -Subproject commit d6c995608d4840df2bef38a5baf8e5b0f90915f8 +Subproject commit 8e5d181fff4eab544dd4dd71a92594ba537fa437 diff --git a/tests/twisted/jingle/incoming-gmail-modern-jingle.py b/tests/twisted/jingle/incoming-gmail-modern-jingle.py index 3469130..033a997 100644 --- a/tests/twisted/jingle/incoming-gmail-modern-jingle.py +++ b/tests/twisted/jingle/incoming-gmail-modern-jingle.py @@ -31,7 +31,8 @@ def test(q, bus, conn, stream): jt.prepare(send_roster=False) sid = 'c1025763497' - si = elem_iq(stream, 'set', from_=peer, to=self)( + iq_id = 'session_init_iq' + si = elem_iq(stream, 'set', from_=peer, to=self, id=iq_id)( elem(ns.JINGLE, 'jingle', action='session-initiate', sid=sid, initiator=peer)( elem('content', name='video')( elem(ns.JINGLE_RTP, 'description', media='video')( @@ -73,7 +74,11 @@ def test(q, bus, conn, stream): ) stream.send(si) - nc, nsh = q.expect_many( + ok, nc, nsh = q.expect_many( + # fd.o #65131: we have to tell Google which dialect we're speaking + EventPattern('stream-iq', iq_type='result', + query_name='jingle', query_ns=ns.JINGLE, + iq_id=iq_id), EventPattern('dbus-signal', signal='NewChannels'), EventPattern('dbus-signal', signal='NewSessionHandler'), ) -- 1.7.10.4