[telepathy-gabble/master] Add a regression test.

[Will Thompson]

---
 tests/twisted/Makefile.am                         |    1 +
 tests/twisted/roster/removed-from-rp-subscribe.py |  100 +++++++++++++++++++++
 2 files changed, 101 insertions(+), 0 deletions(-)
 create mode 100644 tests/twisted/roster/removed-from-rp-subscribe.py

diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am
index 42df05f..c7ffb00 100644
--- a/tests/twisted/Makefile.am
+++ b/tests/twisted/Makefile.am
@@ -26,6 +26,7 @@ TWISTED_TESTS = \
 	roster/ensure.py \
 	roster/groups.py \
 	roster/groups-12791.py \
+	roster/removed-from-rp-subscribe.py \
 	roster/request-group-before-roster.py \
 	roster/request-group-after-roster.py \
 	roster/test-google-roster.py \
diff --git a/tests/twisted/roster/removed-from-rp-subscribe.py b/tests/twisted/roster/removed-from-rp-subscribe.py
new file mode 100644
index 0000000..56d3f46
--- /dev/null
+++ b/tests/twisted/roster/removed-from-rp-subscribe.py
@@ -0,0 +1,100 @@
+"""
+Regression test for reacting to other clients making and then rescinding
+subscription requests while we're online.
+"""
+
+from twisted.words.protocols.jabber.client import IQ
+
+from servicetest import tp_path_prefix, EventPattern
+from gabbletest import exec_test, expect_list_channel
+import constants as cs
+import ns
+
+jid = 'marco at barisione.lit'
+
+def test(q, bus, conn, stream):
+    conn.Connect()
+
+    # Gabble asks for the roster; the server sends back an empty roster.
+    event = q.expect('stream-iq', query_ns=ns.ROSTER)
+    event.stanza['type'] = 'result'
+    stream.send(event.stanza)
+
+    publish = expect_list_channel(q, bus, conn, 'publish', [])
+    subscribe = expect_list_channel(q, bus, conn, 'subscribe', [])
+    stored = expect_list_channel(q, bus, conn, 'stored', [])
+
+    h = conn.RequestHandles(cs.HT_CONTACT, [jid])[0]
+
+    # Another client logged into our account (Gajim, say) wants to subscribe to
+    # Marco's presence. First, per RFC 3921 it 'SHOULD perform a "roster set"
+    # for the new roster item':
+    #
+    #   <iq type='set'>
+    #     <query xmlns='jabber:iq:roster'>
+    #       <item jid='marco at barisione.lit'/>
+    #     </query>
+    #   </iq>
+    #
+    # 'As a result, the user's server (1) MUST initiate a roster push for the
+    # new roster item to all available resources associated with this user that
+    # have requested the roster, setting the 'subscription' attribute to a
+    # value of "none"':
+    iq = IQ(stream, "set")
+    item = iq.addElement((ns.ROSTER, 'query')).addElement('item')
+    item['jid'] = jid
+    item['subscription'] = 'none'
+    stream.send(iq)
+
+    # In response, Gabble should add Marco to stored:
+    q.expect('dbus-signal', signal='MembersChanged',
+        args=['', [h], [], [], [], 0, 0],
+        path=stored.object_path[len(tp_path_prefix):])
+
+    # Gajim sends a <presence type='subscribe'/> to Marco. 'As a result, the
+    # user's server MUST initiate a second roster push to all of the user's
+    # available resources that have requested the roster, setting [...]
+    # ask='subscribe' attribute in the roster item [for Marco]:
+    iq = IQ(stream, "set")
+    item = iq.addElement((ns.ROSTER, 'query')).addElement('item')
+    item['jid'] = jid
+    item['subscription'] = 'none'
+    item['ask'] = 'subscribe'
+    stream.send(iq)
+
+    # In response, Gabble should add Marco to subscribe:remote-pending:
+    q.expect('dbus-signal', signal='MembersChanged',
+        args=['', [], [], [], [h], 0, 0],
+        path=subscribe.object_path[len(tp_path_prefix):])
+
+    # The user driving Gajim decides that they don't care what Marco's baking
+    # after all (maybe they read his blog instead?) and removes him from the
+    # roster. The server must 'inform all of the user's available resources
+    # that have requested the roster of the roster item removal':
+    iq = IQ(stream, "set")
+    item = iq.addElement((ns.ROSTER, 'query')).addElement('item')
+    item['jid'] = jid
+    item['subscription'] = 'remove'
+    # When Marco found this bug, this roster update included:
+    item['ask'] = 'subscribe'
+    # which is a bit weird: I don't think the server should send that when the
+    # contact's being removed. I think Gabble should ignore it, so I'm
+    # including it in the test.
+    stream.send(iq)
+
+    # In response, Gabble should announce that Marco has been removed from
+    # subscribe:remote-pending and stored:members:
+    q.expect_many(
+        EventPattern('dbus-signal', signal='MembersChanged',
+            args=['', [], [h], [], [], 0, 0],
+            path=subscribe.object_path[len(tp_path_prefix):]),
+        EventPattern('dbus-signal', signal='MembersChanged',
+            args=['', [], [h], [], [], 0, 0],
+            path=stored.object_path[len(tp_path_prefix):]),
+        )
+
+    # Arrivederci!
+    conn.Disconnect()
+
+if __name__ == '__main__':
+    exec_test(test)
-- 
1.5.6.5