Changeset 90:1ffd4dd005e4

Timestamp:

02/25/2010 11:55:52 (5 months ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Tags:

tip

Message:

Ignore error messages in PubSubClient?.

Author: ralphm
Reviewer: arjan
Fixes: #69

Location:

wokkel

Files:

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

wokkel/pubsub.py

@@ -664 +664 @@
 
     def _onEvent(self, message):
+        if message.getAttribute('type') == 'error':
+            return
+
         try:
             sender = jid.JID(message["from"])

wokkel/test/test_pubsub.py

@@ -184 +184 @@
         self.stub.send(message)
         return d
+
+
+    def test_eventItemsError(self):
+        """
+        An error message with embedded event should not be handled.
+
+        This test uses an items event, which should not result in itemsReceived
+        being called. In general message.handled should be False.
+        """
+        message = domish.Element((None, 'message'))
+        message['from'] = 'pubsub.example.org'
+        message['to'] = 'user@example.org/home'
+        message['type'] = 'error'
+        event = message.addElement((NS_PUBSUB_EVENT, 'event'))
+        items = event.addElement('items')
+        items['node'] = 'test'
+
+        class UnexpectedCall(Exception):
+            pass
+
+        def itemsReceived(event):
+            raise UnexpectedCall("Unexpected call to itemsReceived")
+
+        self.protocol.itemsReceived = itemsReceived
+        self.stub.send(message)
+        self.assertFalse(message.handled)