telepathy-gabble: Update Wocky for fd.o #65131, and test it

[Simon McVittie]

Module: telepathy-gabble
Branch: master
Commit: 0c7953c80da6aa0fef030669c0588a3451678498
URL:    http://cgit.freedesktop.org/telepathy/telepathy-gabble/commit/?id=0c7953c80da6aa0fef030669c0588a3451678498

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Thu May 30 20:34:47 2013 +0100

Update Wocky for fd.o #65131, and test it

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=65131
Reviewed-by: Xavier Claessens <xavier.claessens at collabora.co.uk>

---

 lib/ext/wocky                                      |    2 +-
 .../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..0561059 160000
--- a/lib/ext/wocky
+++ b/lib/ext/wocky
@@ -1 +1 @@
-Subproject commit d6c995608d4840df2bef38a5baf8e5b0f90915f8
+Subproject commit 0561059639160cbd11e1764ef861348c0c23831c
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'),
         )