Attachment 87038 Details for Bug 70078 – tube tests: make sure to catch the right MUC presence stanza

[patch] tube tests: make sure to catch the right MUC presence stanza

0005-tube-tests-make-sure-to-catch-the-right-MUC-presence.patch (text/plain), 4.61 KB, created by Guillaume Desmottes on 2013-10-03 14:16:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guillaume Desmottes

Created: 2013-10-03 14:16:03 UTC

Size: 4.61 KB

patch

obsolete

>From c4c284b0d15a070f4b760b724bef1525ea6a410d Mon Sep 17 00:00:00 2001
>From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
>Date: Thu, 3 Oct 2013 16:00:01 +0200
>Subject: [PATCH 5/8] tube tests: make sure to catch the right MUC presence
> stanza
>
>Not requesting the room handle any more will have a side effect to catch
>another presence stanza. Make sure to wait for the one containing the tube.
>---
> tests/twisted/tubes/accept-muc-dbus-tube.py  | 3 ++-
> tests/twisted/tubes/offer-muc-dbus-tube.py   | 2 +-
> tests/twisted/tubes/offer-muc-stream-tube.py | 4 ++--
> tests/twisted/tubes/tubetestutil.py          | 5 +++++
> 4 files changed, 10 insertions(+), 4 deletions(-)
>
>diff --git a/tests/twisted/tubes/accept-muc-dbus-tube.py b/tests/twisted/tubes/accept-muc-dbus-tube.py
>index d0dadac..2606fa2 100644
>--- a/tests/twisted/tubes/accept-muc-dbus-tube.py
>+++ b/tests/twisted/tubes/accept-muc-dbus-tube.py
>@@ -11,6 +11,7 @@ from twisted.words.xish import xpath
> import ns
> 
> from mucutil import join_muc_and_check
>+import tubetestutil as t
> 
> def test(q, bus, conn, stream, access_control):
>     iq_event = q.expect('stream-iq', to=None, query_ns='vcard-temp',
>@@ -75,7 +76,7 @@ def test(q, bus, conn, stream, access_control):
>         EventPattern('dbus-return', method='Accept'),
>         EventPattern('dbus-signal', signal='DBusNamesChanged', interface=cs.CHANNEL_TYPE_DBUS_TUBE),
>         EventPattern('dbus-signal', signal='DBusNamesChanged', interface=cs.CHANNEL_TYPE_DBUS_TUBE),
>-        EventPattern('stream-presence', to='chat@conf.localhost/test'))
>+        EventPattern('stream-presence', to='chat@conf.localhost/test', predicate=lambda e: t.presence_contains_tube(e)))
> 
>     tube_addr = return_event.value[0]
>     assert len(tube_addr) > 0
>diff --git a/tests/twisted/tubes/offer-muc-dbus-tube.py b/tests/twisted/tubes/offer-muc-dbus-tube.py
>index 563e001..ff10045 100644
>--- a/tests/twisted/tubes/offer-muc-dbus-tube.py
>+++ b/tests/twisted/tubes/offer-muc-dbus-tube.py
>@@ -163,7 +163,7 @@ def test(q, bus, conn, stream, access_control):
>     call_async(q, tube_chan.DBusTube, 'Offer', sample_parameters, access_control)
> 
>     presence_event, return_event, status_event, dbus_changed_event = q.expect_many(
>-        EventPattern('stream-presence', to='chat2@conf.localhost/test'),
>+        EventPattern('stream-presence', to='chat2@conf.localhost/test', predicate=lambda e: t.presence_contains_tube(e)),
>         EventPattern('dbus-return', method='Offer'),
>         EventPattern('dbus-signal', signal='TubeChannelStateChanged', args=[cs.TUBE_CHANNEL_STATE_OPEN]),
>         EventPattern('dbus-signal', signal='DBusNamesChanged', interface=cs.CHANNEL_TYPE_DBUS_TUBE))
>diff --git a/tests/twisted/tubes/offer-muc-stream-tube.py b/tests/twisted/tubes/offer-muc-stream-tube.py
>index ce7f338..1a36045 100644
>--- a/tests/twisted/tubes/offer-muc-stream-tube.py
>+++ b/tests/twisted/tubes/offer-muc-stream-tube.py
>@@ -101,7 +101,7 @@ def test(q, bus, conn, stream, bytestream_cls,
>         cs.TARGET_ID: 'chat@conf.localhost',
>         cs.STREAM_TUBE_SERVICE: 'newecho',
>     }
>-    _, _, new_tube_path, new_tube_props = \
>+    _, new_tube_path, new_tube_props = \
>         join_muc(q, bus, conn, stream, 'chat@conf.localhost', request)
> 
>     e = q.expect('dbus-signal', signal='NewChannels',
>@@ -129,7 +129,7 @@ def test(q, bus, conn, stream, bytestream_cls,
>     call_async(q, tube_chan.StreamTube, 'Offer', address_type, address, access_control, {'foo': 'bar'})
> 
>     stream_event, _, status_event = q.expect_many(
>-        EventPattern('stream-presence', to='chat@conf.localhost/test'),
>+        EventPattern('stream-presence', to='chat@conf.localhost/test', predicate=lambda e: t.presence_contains_tube(e)),
>         EventPattern('dbus-return', method='Offer'),
>         EventPattern('dbus-signal', signal='TubeChannelStateChanged', args=[cs.TUBE_CHANNEL_STATE_OPEN]))
> 
>diff --git a/tests/twisted/tubes/tubetestutil.py b/tests/twisted/tubes/tubetestutil.py
>index 9edf27b..3c53d15 100644
>--- a/tests/twisted/tubes/tubetestutil.py
>+++ b/tests/twisted/tubes/tubetestutil.py
>@@ -21,6 +21,7 @@ from twisted.internet import reactor
> from twisted.internet.protocol import Factory, Protocol
> from twisted.internet.error import CannotListenError
> from twisted.internet import tcp
>+from twisted.words.xish import xpath
> 
> _to_cleanup = []
> 
>@@ -373,3 +374,7 @@ def exec_stream_tube_test(test):
> def exec_dbus_tube_test(test):
>     exec_tube_test(test, cs.SOCKET_ACCESS_CONTROL_CREDENTIALS)
>     exec_tube_test(test, cs.SOCKET_ACCESS_CONTROL_LOCALHOST)
>+
>+def presence_contains_tube(e):
>+    return xpath.queryForNodes('/presence/tubes[@xmlns="%s"]/tube'
>+        % ns.TUBES, e.stanza) is not None
>-- 
>1.8.3.1
>

Actions: View | Splinter Review

Attachments on bug 70078: 87034 | 87035 | 87036 | 87037 | 87038 | 87039 | 87040 | 87041 | 87107 | 87108 | 87111 | 87112

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.