Attachment 87037 Details for Bug 70078 – join_muc_and_check: stop returning the muc handle

[patch] join_muc_and_check: stop returning the muc handle

0004-join_muc_and_check-stop-returning-the-muc-handle.patch (text/plain), 3.96 KB, created by Guillaume Desmottes on 2013-10-03 14:15:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guillaume Desmottes

Created: 2013-10-03 14:15:49 UTC

Size: 3.96 KB

patch

obsolete

>From b428611ca5887584fb5d3b0d142688f8b3932071 Mon Sep 17 00:00:00 2001
>From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
>Date: Thu, 3 Oct 2013 15:11:05 +0200
>Subject: [PATCH 4/8] join_muc_and_check: stop returning the muc handle
>
>---
> tests/twisted/muc/chat-states.py            | 2 +-
> tests/twisted/muc/scrollback.py             | 2 +-
> tests/twisted/muc/send-error.py             | 2 +-
> tests/twisted/muc/test-muc.py               | 3 +--
> tests/twisted/mucutil.py                    | 2 +-
> tests/twisted/tubes/accept-muc-dbus-tube.py | 2 +-
> 6 files changed, 6 insertions(+), 7 deletions(-)
>
>diff --git a/tests/twisted/muc/chat-states.py b/tests/twisted/muc/chat-states.py
>index 4be5f50..87a008d 100644
>--- a/tests/twisted/muc/chat-states.py
>+++ b/tests/twisted/muc/chat-states.py
>@@ -31,7 +31,7 @@ def check_state_notification(elem, name, allow_body=False):
>         assert len(elem.children) == 1, elem.toXml()
> 
> def test(q, bus, conn, stream):
>-    (muc_handle, chan, user, bob) = join_muc_and_check(q, bus, conn, stream,
>+    (chan, user, bob) = join_muc_and_check(q, bus, conn, stream,
>         MUC)
> 
>     states = chan.Properties.Get(cs.CHANNEL_IFACE_CHAT_STATE, 'ChatStates')
>diff --git a/tests/twisted/muc/scrollback.py b/tests/twisted/muc/scrollback.py
>index 7dec1b3..a1f75c6 100644
>--- a/tests/twisted/muc/scrollback.py
>+++ b/tests/twisted/muc/scrollback.py
>@@ -20,7 +20,7 @@ def test(q, bus, conn, stream):
>     bob_jid = room + '/bob'
>     marco_jid = room + '/marco'
> 
>-    room_handle, chan, test_handle, bob_handle = \
>+    chan, test_handle, bob_handle = \
>         join_muc_and_check(q, bus, conn, stream, room)
> 
>     # Here are a few scrollback messages. One from us; one from bob; and one
>diff --git a/tests/twisted/muc/send-error.py b/tests/twisted/muc/send-error.py
>index 33f376b..219fa4d 100644
>--- a/tests/twisted/muc/send-error.py
>+++ b/tests/twisted/muc/send-error.py
>@@ -14,7 +14,7 @@ from mucutil import join_muc_and_check
> 
> def test(q, bus, conn, stream):
>     muc = 'chat@conf.localhost'
>-    _, text_chan, test_handle, bob_handle = \
>+    text_chan, test_handle, bob_handle = \
>         join_muc_and_check(q, bus, conn, stream, muc)
> 
>     # Suppose we don't have permission to speak in this MUC.  Send a message to
>diff --git a/tests/twisted/muc/test-muc.py b/tests/twisted/muc/test-muc.py
>index 01f00a8..c469e8e 100644
>--- a/tests/twisted/muc/test-muc.py
>+++ b/tests/twisted/muc/test-muc.py
>@@ -19,12 +19,11 @@ from mucutil import join_muc_and_check
> 
> def test(q, bus, conn, stream):
>     room = 'chat@conf.localhost'
>-    room_handle, chan, test_handle, bob_handle = \
>+    chan, test_handle, bob_handle = \
>         join_muc_and_check(q, bus, conn, stream, room)
> 
>     # Exercise basic Channel Properties from spec 0.17.7
>     channel_props = chan.Properties.GetAll(cs.CHANNEL)
>-    assertEquals(room_handle, channel_props.get('TargetHandle'))
>     assertEquals(cs.HT_ROOM, channel_props.get('TargetHandleType'))
>     assertEquals(cs.CHANNEL_TYPE_TEXT, channel_props.get('ChannelType'))
> 
>diff --git a/tests/twisted/mucutil.py b/tests/twisted/mucutil.py
>index 7fcd708..1edd28c 100644
>--- a/tests/twisted/mucutil.py
>+++ b/tests/twisted/mucutil.py
>@@ -98,4 +98,4 @@ def join_muc_and_check(q, bus, conn, stream, muc, request=None):
>     assert set(members) == set([test_handle, bob_handle]), \
>         (members, (test_handle, bob_handle))
> 
>-    return (muc_handle, chan, test_handle, bob_handle)
>+    return (chan, test_handle, bob_handle)
>diff --git a/tests/twisted/tubes/accept-muc-dbus-tube.py b/tests/twisted/tubes/accept-muc-dbus-tube.py
>index b1a3dfb..d0dadac 100644
>--- a/tests/twisted/tubes/accept-muc-dbus-tube.py
>+++ b/tests/twisted/tubes/accept-muc-dbus-tube.py
>@@ -19,7 +19,7 @@ def test(q, bus, conn, stream, access_control):
>     acknowledge_iq(stream, iq_event.stanza)
> 
>     muc = 'chat@conf.localhost'
>-    _, _, test_handle, bob_handle = \
>+    _, test_handle, bob_handle = \
>         join_muc_and_check(q, bus, conn, stream, muc)
> 
>     # Bob offers a stream tube
>-- 
>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.