Changeset 63:b8139f79276f

Timestamp:

Jul 6, 2009, 9:26:47 AM (11 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Convert:

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

Message:

Make IQ timeouts work for InternalComponents?.

This introduces wokkel.compat.IQ to work with older Twisted versions, too.

Author: ralphm.
Fixes #53.

Location:

wokkel

Files:

• compat.py (modified) (2 diffs)
• disco.py (modified) (3 diffs)
• pubsub.py (modified) (4 diffs)
• test/test_compat.py (modified) (2 diffs)
• test/test_disco.py (modified) (2 diffs)
• xmppim.py (modified) (1 diff)

wokkel/compat.py

@@ -1 +1 @@
 # -*- test-case-name: wokkel.test.test_compat -*-
 #
-# Copyright (c) 2001-2008 Twisted Matrix Laboratories.
+# Copyright (c) 2001-2009 Twisted Matrix Laboratories.
 # See LICENSE for details.
 
 from twisted.internet import protocol
 from twisted.words.protocols.jabber import xmlstream
-from twisted.words.xish import domish
 
 class BootstrapMixin(object):
@@ -95 +94 @@
         self.installBootstraps(xs)
         return xs
+
+
+
+class IQ(xmlstream.IQ):
+    def __init__(self, *args, **kwargs):
+        # Make sure we have a reactor parameter
+        try:
+            reactor = kwargs['reactor']
+        except KeyError:
+            from twisted.internet import reactor
+        kwargs['reactor'] = reactor
+
+        # Check if IQ's init accepts the reactor parameter
+        try:
+            xmlstream.IQ.__init__(self, *args, **kwargs)
+        except TypeError:
+            # Guess not. Remove the reactor parameter and try again.
+            del kwargs['reactor']
+            xmlstream.IQ.__init__(self, *args, **kwargs)
+
+            # Patch the XmlStream instance so that it has a _callLater
+            self._xmlstream._callLater = reactor.callLater

wokkel/disco.py

@@ -12 +12 @@
 
 from twisted.internet import defer
-from twisted.words.protocols.jabber import error, jid, xmlstream
+from twisted.words.protocols.jabber import error, jid
 from twisted.words.xish import domish
 
 from wokkel import data_form
+from wokkel.compat import IQ
 from wokkel.iwokkel import IDisco
 from wokkel.subprotocols import IQHandlerMixin, XMPPHandler
@@ -346 +347 @@
 
 
-class _DiscoRequest(xmlstream.IQ):
+class _DiscoRequest(IQ):
     """
     Element representing an XMPP service discovery request.
@@ -362 +363 @@
         @type nodeIdentifier: C{unicode}
         """
-        xmlstream.IQ.__init__(self, xs, "get")
+        IQ.__init__(self, xs, "get")
         query = self.addElement((namespace, 'query'))
         if nodeIdentifier:

wokkel/pubsub.py

@@ -1 +1 @@
 # -*- test-case-name: wokkel.test.test_pubsub -*-
 #
-# Copyright (c) 2003-2008 Ralph Meijer
+# Copyright (c) 2003-2009 Ralph Meijer
 # See LICENSE for details.
 
@@ -15 +15 @@
 from twisted.internet import defer
 from twisted.python import log
-from twisted.words.protocols.jabber import jid, error, xmlstream
+from twisted.words.protocols.jabber import jid, error
 from twisted.words.xish import domish
 
 from wokkel import disco, data_form, generic, shim
+from wokkel.compat import IQ
 from wokkel.subprotocols import IQHandlerMixin, XMPPHandler
 from wokkel.iwokkel import IPubSubClient, IPubSubService, IPubSubResource
@@ -476 +477 @@
 
         This renders all of the relevant parameters for this specific
-        requests into an L{xmlstream.IQ}, and invoke its C{send} method.
+        requests into an L{IQ}, and invoke its C{send} method.
         This returns a deferred that fires upon reception of a response. See
-        L{xmlstream.IQ} for details.
+        L{IQ} for details.
 
         @param xs: The XML stream to send the request on.
@@ -492 +493 @@
             raise NotImplementedError()
 
-        iq = xmlstream.IQ(xs, self.stanzaType)
+        iq = IQ(xs, self.stanzaType)
         iq.addElement((childURI, 'pubsub'))
         verbElement = iq.pubsub.addElement(childName)

wokkel/test/test_compat.py

@@ -7 +7 @@
 """
 
+from zope.interface import implements
 from zope.interface.verify import verifyObject
-from twisted.internet import defer, protocol
-from twisted.internet.interfaces import IProtocolFactory
+from twisted.internet import protocol, task
+from twisted.internet.interfaces import IProtocolFactory, IReactorTime
 from twisted.trial import unittest
-from twisted.words.xish import domish, utility
+from twisted.words.xish import utility
 from twisted.words.protocols.jabber import xmlstream
-from wokkel.compat import BootstrapMixin, XmlStreamServerFactory
+from wokkel.compat import BootstrapMixin, IQ, XmlStreamServerFactory
 
 class DummyProtocol(protocol.Protocol, utility.EventDispatcher):
@@ -166 +167 @@
         xs = self.factory.buildProtocol(None)
         self.assertIdentical(self.factory, xs.factory)
+
+
+
+class FakeReactor(object):
+
+    implements(IReactorTime)
+    def __init__(self):
+        self.clock = task.Clock()
+        self.callLater = self.clock.callLater
+        self.getDelayedCalls = self.clock.getDelayedCalls
+
+
+
+class IQTest(unittest.TestCase):
+    """
+    Tests for L{IQ}.
+    """
+
+    def setUp(self):
+        self.reactor = FakeReactor()
+        self.clock = self.reactor.clock
+
+
+    def testRequestTimingOutEventDispatcher(self):
+        """
+        Test that an iq request with a defined timeout times out.
+        """
+        from twisted.words.xish import utility
+        output = []
+        xs = utility.EventDispatcher()
+        xs.send = output.append
+
+        self.iq = IQ(xs, reactor=self.reactor)
+        self.iq.timeout = 60
+        d = self.iq.send()
+        self.assertFailure(d, xmlstream.TimeoutError)
+
+        self.clock.pump([1, 60])
+        self.assertFalse(self.reactor.getDelayedCalls())
+        self.assertFalse(xs.iqDeferreds)
+        return d

wokkel/test/test_disco.py

@@ -526 +526 @@
 
         response = toResponse(iq, u'result')
-        query = response.addElement((NS_DISCO_ITEMS, u'query'))
+        response.addElement((NS_DISCO_ITEMS, u'query'))
         self.stub.send(response)
 
@@ -582 +582 @@
 
         response = toResponse(iq, u'result')
-        query = response.addElement((NS_DISCO_INFO, u'query'))
+        response.addElement((NS_DISCO_INFO, u'query'))
         self.stub.send(response)
 

wokkel/xmppim.py

@@ -14 +14 @@
 
 from twisted.words.protocols.jabber.jid import JID
-from twisted.words.protocols.jabber.xmlstream import IQ
 from twisted.words.xish import domish
 
+from wokkel.compat import IQ
 from wokkel.subprotocols import XMPPHandler