Attachment 46265 Details for Bug 28918 – 0002 Test to cover MUC JOIN initiated by the server

[patch] 0002 Test to cover MUC JOIN initiated by the server

0002-Test-to-cover-MUC-JOIN-initiated-by-the-server.patch (text/plain), 3.59 KB, created by Debarshi Ray on 2011-05-02 16:12:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Debarshi Ray

Created: 2011-05-02 16:12:23 UTC

Size: 3.59 KB

patch

obsolete

>From 42b2d054148c430d235e761046700e23932b5146 Mon Sep 17 00:00:00 2001
>From: Debarshi Ray <rishi@gnu.org>
>Date: Fri, 22 Apr 2011 15:06:56 +0300
>Subject: [PATCH 2/2] Test to cover MUC JOIN initiated by the server
>
>Proxies and bouncers usually send a JOIN message to the client for each
>channel the user is a member of.
>
>Fixes: https://bugs.freedesktop.org/28918
>---
> tests/twisted/Makefile.am                          |    1 +
> tests/twisted/channels/join-muc-channel-bouncer.py |   70 ++++++++++++++++++++
> 2 files changed, 71 insertions(+), 0 deletions(-)
> create mode 100644 tests/twisted/channels/join-muc-channel-bouncer.py
>
>diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am
>index 338d03e..95c50e4 100644
>--- a/tests/twisted/Makefile.am
>+++ b/tests/twisted/Makefile.am
>@@ -8,6 +8,7 @@ TWISTED_TESTS = \
> 		connect/server-quit-noclose.py \
> 		connect/invalid-nick.py \
> 		channels/join-muc-channel.py \
>+		channels/join-muc-channel-bouncer.py \
> 		channels/requests-create.py \
> 		channels/requests-muc.py \
> 		channels/muc-channel-topic.py \
>diff --git a/tests/twisted/channels/join-muc-channel-bouncer.py b/tests/twisted/channels/join-muc-channel-bouncer.py
>new file mode 100644
>index 0000000..09f12a1
>--- /dev/null
>+++ b/tests/twisted/channels/join-muc-channel-bouncer.py
>@@ -0,0 +1,70 @@
>+
>+"""
>+Test connecting to a IRC channel when prompted by a bouncer
>+"""
>+
>+from idletest import exec_test
>+from servicetest import (
>+    EventPattern, assertEquals, call_async, make_channel_proxy
>+)
>+from constants import *
>+
>+def test_join_bouncer(q, conn, stream, room):
>+    room_handles = conn.RequestHandles(HT_ROOM, [room])
>+    stream.sendJoin(room)
>+
>+    new_channels = EventPattern('dbus-signal', signal='NewChannels')
>+    event = q.expect_many(new_channels)[0]
>+    q.forbid_events([new_channels])
>+    channel_details = event.args[0]
>+    assertEquals(1, len(channel_details))
>+    path, props = channel_details[0]
>+    assertEquals(HT_ROOM, props[TARGET_HANDLE_TYPE])
>+    assertEquals(room_handles[0], props[TARGET_HANDLE])
>+    assertEquals(CHANNEL_TYPE_TEXT, props[CHANNEL_TYPE])
>+
>+    new_channel = EventPattern('dbus-signal', signal='NewChannel')
>+    event = q.expect_many(new_channel)[0]
>+    q.forbid_events([new_channel])
>+    assertEquals(CHANNEL_TYPE_TEXT, event.args[1])
>+    assertEquals(HT_ROOM, event.args[2])
>+    assertEquals(room_handles[0], event.args[3])
>+
>+    q.expect('dbus-signal', signal='MembersChanged')
>+
>+    q.unforbid_events([new_channels, new_channel])
>+    return path
>+
>+def test(q, bus, conn, stream):
>+    conn.Connect()
>+    q.expect_many(
>+            EventPattern('dbus-signal', signal='StatusChanged', args=[1, 1]),
>+            EventPattern('irc-connected'))
>+    q.expect('dbus-signal', signal='SelfHandleChanged',
>+        args=[1L])
>+    q.expect('dbus-signal', signal='StatusChanged', args=[0, 1])
>+
>+    CHANNEL_NAME = "#idletest"
>+
>+    self_handle = conn.GetSelfHandle()
>+
>+    # The bouncer initiates a JOIN.
>+    path = test_join_bouncer(q, conn, stream, CHANNEL_NAME)
>+
>+    # We PART.
>+    chan = make_channel_proxy(conn, path, 'Channel')
>+    chan.RemoveMembers([self_handle], "bye bye cruel world",
>+        dbus_interface=CHANNEL_IFACE_GROUP)
>+    q.expect('dbus-signal', signal='MembersChanged')
>+
>+    # The bouncer initiates a JOIN to force the issue.
>+    test_join_bouncer(q, conn, stream, CHANNEL_NAME)
>+
>+    call_async(q, conn, 'Disconnect')
>+    q.expect_many(
>+            EventPattern('dbus-return', method='Disconnect'),
>+            EventPattern('dbus-signal', signal='StatusChanged', args=[2, 1]))
>+    return True
>+
>+if __name__ == '__main__':
>+    exec_test(test)
>-- 
>1.7.4.4
>

Actions: View | Splinter Review

Attachments on bug 28918: 45793 | 45949 | 45950 | 46264 | 46265

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.