Changeset 87:c9d1bf0b783d
- Timestamp:
- Jan 10, 2010, 3:01:41 PM (11 years ago)
- Branch:
- default
- Location:
- wokkel
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
wokkel/pubsub.py
r86 r87 1048 1048 self.resource = resource 1049 1049 self.discoIdentity = {'category': 'pubsub', 1050 'type': ' generic',1050 'type': 'service', 1051 1051 'name': 'Generic Publish-Subscribe Service'} 1052 1052 … … 1093 1093 getInfo = resource.getInfo 1094 1094 else: 1095 category, idType, name = self.discoIdentity 1095 category = self.discoIdentity['category'] 1096 idType = self.discoIdentity['type'] 1097 name = self.discoIdentity['name'] 1096 1098 identity = disco.DiscoIdentity(category, idType, name) 1097 1099 features = self.pubSubFeatures … … 1104 1106 for feature in features]) 1105 1107 1106 d = getInfo(requestor, target, nodeIdentifier or '')1108 d = defer.maybeDeferred(getInfo, requestor, target, nodeIdentifier or '') 1107 1109 d.addCallback(toInfo, info) 1108 1110 d.addErrback(log.err) -
wokkel/test/test_pubsub.py
r86 r87 3157 3157 3158 3158 3159 def test_getDiscoInfo(self): 3160 """ 3161 Test getDiscoInfo calls getNodeInfo and returns some minimal info. 3162 """ 3163 def cb(info): 3164 discoInfo = disco.DiscoInfo() 3165 for item in info: 3166 discoInfo.append(item) 3167 self.assertIn(('pubsub', 'service'), discoInfo.identities) 3168 self.assertIn(disco.NS_DISCO_ITEMS, discoInfo.features) 3169 3170 d = self.service.getDiscoInfo(JID('user@example.org/home'), 3171 JID('pubsub.example.org'), '') 3172 d.addCallback(cb) 3173 return d 3174 3175 3159 3176 def test_publish(self): 3160 3177 """
Note: See TracChangeset
for help on using the changeset viewer.