diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-05-30 20:34:47 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-05-30 20:34:47 +0100 |
| commit | 0c7953c80da6aa0fef030669c0588a3451678498 (patch) | |
| tree | d76f209be6679af54132a5cd356179d656c62035 | |
| parent | 7e8aec731742c07513419e3c3582337871b066d3 (diff) | |
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@collabora.co.uk>
| m--------- | lib/ext/wocky | 0 | ||||
| -rw-r--r-- | tests/twisted/jingle/incoming-gmail-modern-jingle.py | 9 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lib/ext/wocky b/lib/ext/wocky -Subproject d6c995608d4840df2bef38a5baf8e5b0f90915f +Subproject 0561059639160cbd11e1764ef861348c0c23831 diff --git a/tests/twisted/jingle/incoming-gmail-modern-jingle.py b/tests/twisted/jingle/incoming-gmail-modern-jingle.py index 34691306d..033a9975d 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'), ) |