Changeset 87:c9d1bf0b783d

Timestamp:

Jan 10, 2010, 3:01:41 PM (11 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Message:

Correctly report disco identity for PubSubService? without PubSubResource?.

Author: ralphm.
Fixes #64.

Location:

wokkel

Files:

• pubsub.py (modified) (3 diffs)
• test/test_pubsub.py (modified) (1 diff)

wokkel/pubsub.py

@@ -1048 +1048 @@
         self.resource = resource
         self.discoIdentity = {'category': 'pubsub',
-                              'type': 'generic',
+                              'type': 'service',
                               'name': 'Generic Publish-Subscribe Service'}
 
@@ -1093 +1093 @@
             getInfo = resource.getInfo
         else:
-            category, idType, name = self.discoIdentity
+            category = self.discoIdentity['category']
+            idType = self.discoIdentity['type']
+            name = self.discoIdentity['name']
             identity = disco.DiscoIdentity(category, idType, name)
             features = self.pubSubFeatures
@@ -1104 +1106 @@
                          for feature in features])
 
-        d = getInfo(requestor, target, nodeIdentifier or '')
+        d = defer.maybeDeferred(getInfo, requestor, target, nodeIdentifier or '')
         d.addCallback(toInfo, info)
         d.addErrback(log.err)

wokkel/test/test_pubsub.py

@@ -3157 +3157 @@
 
 
+    def test_getDiscoInfo(self):
+        """
+        Test getDiscoInfo calls getNodeInfo and returns some minimal info.
+        """
+        def cb(info):
+            discoInfo = disco.DiscoInfo()
+            for item in info:
+                discoInfo.append(item)
+            self.assertIn(('pubsub', 'service'), discoInfo.identities)
+            self.assertIn(disco.NS_DISCO_ITEMS, discoInfo.features)
+
+        d = self.service.getDiscoInfo(JID('user@example.org/home'),
+                                      JID('pubsub.example.org'), '')
+        d.addCallback(cb)
+        return d
+
+
     def test_publish(self):
         """