Attachment 56960 Details for Bug 45982 – groups.py: factor out parse_roster_change_request()

[patch] groups.py: factor out parse_roster_change_request()

groupspy-factor-out-parserosterchangerequest.patch (text/plain), 2.57 KB, created by Guillaume Desmottes on 2012-02-13 04:30:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guillaume Desmottes

Created: 2012-02-13 04:30:04 UTC

Size: 2.57 KB

patch

obsolete

>From 142b3e2dd82f5f9f22bf37d0bff0d369e021f227 Mon Sep 17 00:00:00 2001
>From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
>Date: Mon, 13 Feb 2012 11:43:17 +0100
>Subject: [PATCH] groups.py: factor out parse_roster_change_request()
>
>https://bugs.freedesktop.org/show_bug.cgi?id=45982
>---
> tests/twisted/roster/groups.py |   32 +++++++++++++++-----------------
> 1 files changed, 15 insertions(+), 17 deletions(-)
>
>diff --git a/tests/twisted/roster/groups.py b/tests/twisted/roster/groups.py
>index aec8a19..7126639 100644
>--- a/tests/twisted/roster/groups.py
>+++ b/tests/twisted/roster/groups.py
>@@ -5,13 +5,23 @@ Test basic roster group functionality.
> from gabbletest import exec_test, acknowledge_iq, sync_stream
> from rostertest import expect_contact_list_signals, check_contact_list_signals
> from servicetest import (assertLength, EventPattern, assertEquals, call_async,
>-        sync_dbus)
>+        sync_dbus, assertContains, assertDoesNotContain)
> import constants as cs
> import ns
> 
> from twisted.words.protocols.jabber.client import IQ
> from twisted.words.xish import xpath
> 
>+def parse_roster_change_request(query, iq):
>+    item = query.firstChildElement()
>+
>+    groups = set()
>+
>+    for gn in xpath.queryForNodes('/iq/query/item/group', iq):
>+        groups.add(str(gn))
>+
>+    return item['jid'], groups
>+
> def test(q, bus, conn, stream):
>     event = q.expect('stream-iq', query_ns=ns.ROSTER)
>     event.stanza['type'] = 'result'
>@@ -74,14 +84,8 @@ def test(q, bus, conn, stream):
> 
>     assertEquals(set(('ladies', 'people starting with A')), set(s.args[0]))
> 
>-    item = iq.query.firstChildElement()
>-    assertEquals('amy@foo.com', item['jid'])
>-
>-    groups = set()
>-
>-    for gn in xpath.queryForNodes('/iq/query/item/group', iq.stanza):
>-        groups.add(str(gn))
>-
>+    jid, groups = parse_roster_change_request(iq.query, iq.stanza)
>+    assertEquals('amy@foo.com', jid)
>     assertEquals(set(('ladies', 'people starting with A')), groups)
> 
>     acknowledge_iq(stream, iq.stanza)
>@@ -122,14 +126,8 @@ def test(q, bus, conn, stream):
>         iq = q.expect('stream-iq', iq_type='set',
>                 query_name='query', query_ns=ns.ROSTER)
> 
>-        item = iq.query.firstChildElement()
>-        assertEquals('amy@foo.com', item['jid'])
>-
>-        groups = set()
>-
>-        for gn in xpath.queryForNodes('/iq/query/item/group', iq.stanza):
>-            groups.add(str(gn))
>-
>+        jid, groups = parse_roster_change_request(iq.query, iq.stanza)
>+        assertEquals('amy@foo.com', jid)
>         assertEquals(set(('ladies',)), groups)
> 
>         acknowledge_iq(stream, iq.stanza)
>-- 
>1.7.7.6

Actions: View | Splinter Review

Attachments on bug 45982: 56948 | 56959 | 56960 | 56961 | 56962 | 56963

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.