Changeset 65:6936acbdb9bd

Timestamp:

Jul 8, 2009, 10:05:58 PM (13 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Convert:

svn:b33ecbfc-034c-dc11-8662-000475d9059e/trunk@183

Message:

Add support for the XMPP Ping protocol.

Author: ralphm
Fixes #55.

This adds a whole bunch of examples around the ping protocol in different
settings for both the pinger and pingee: as a external server-side component,
as a standalone server with server-to-server connectivity and as a client.

Also updates the disco support to allow for non-deferred responses from
subprotocol handlers

Files:

• doc/examples/ping_component.tac (added)
• doc/examples/ping_s2s.tac (added)
• doc/examples/ping_server.tac (added)
• doc/examples/pinger.py (added)
• doc/examples/pinger_client.tac (added)
• doc/examples/pinger_component.tac (added)
• doc/examples/pinger_s2s.tac (added)
• doc/examples/router.tac (added)
• wokkel/disco.py (modified) (2 diffs)
• wokkel/ping.py (added)
• wokkel/test/test_disco.py (modified) (2 diffs)
• wokkel/test/test_ping.py (added)

wokkel/disco.py

@@ -539 +539 @@
         @rtype: L{defer.Deferred}
         """
-        dl = [handler.getDiscoInfo(requestor, target, nodeIdentifier)
+        dl = [defer.maybeDeferred(handler.getDiscoInfo, requestor, target,
+                                                        nodeIdentifier)
               for handler in self.parent
               if IDisco.providedBy(handler)]
@@ -561 +562 @@
         @rtype: L{defer.Deferred}
         """
-        dl = [handler.getDiscoItems(requestor, target, nodeIdentifier)
+        dl = [defer.maybeDeferred(handler.getDiscoItems, requestor, target,
+                                                         nodeIdentifier)
               for handler in self.parent
               if IDisco.providedBy(handler)]

wokkel/test/test_disco.py

@@ -752 +752 @@
 
 
+    def test_infoNotDeferred(self):
+        """
+        C{info} should gather disco info from sibling handlers.
+        """
+        discoItems = [disco.DiscoIdentity('dummy', 'generic',
+                                          'Generic Dummy Entity'),
+                      disco.DiscoFeature('jabber:iq:version')
+        ]
+
+        class DiscoResponder(XMPPHandler):
+            implements(disco.IDisco)
+
+            def getDiscoInfo(self, requestor, target, nodeIdentifier):
+                if not nodeIdentifier:
+                    return discoItems
+                else:
+                    return []
+
+        def cb(result):
+            self.assertEquals(discoItems, result)
+
+        self.service.parent = [self.service, DiscoResponder()]
+        d = self.service.info(JID('test@example.com'), JID('example.com'), '')
+        d.addCallback(cb)
+        return d
+
+
     def test_items(self):
         """
@@ -774 +801 @@
         d.addCallback(cb)
         return d
+
+
+    def test_itemsNotDeferred(self):
+        """
+        C{info} should also collect results not returned via a deferred.
+        """
+        discoItems = [disco.DiscoItem(JID('example.com'), 'test', 'Test node')]
+
+        class DiscoResponder(XMPPHandler):
+            implements(disco.IDisco)
+
+            def getDiscoItems(self, requestor, target, nodeIdentifier):
+                if not nodeIdentifier:
+                    return discoItems
+                else:
+                    return []
+
+        def cb(result):
+            self.assertEquals(discoItems, result)
+
+        self.service.parent = [self.service, DiscoResponder()]
+        d = self.service.items(JID('test@example.com'), JID('example.com'), '')
+        d.addCallback(cb)
+        return d