Changeset 53:fd2b3f70b221 in ralphm-patches for request-tracking.patch

Timestamp:

Aug 3, 2011, 9:48:58 AM (11 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Message:

Small cleanups for request handling.

File:

• request-tracking.patch (modified) (14 diffs)

request-tracking.patch

@@ -1 +1 @@
 # HG changeset patch
-# Parent 60dcf9e2441bb510f1da17e6bc4401ef7b6db0e9
+# Parent 6f36a7f92973d3843a42b4c80791715e694b66a3
 Add iq request (set/get) tracking for StreamManager.
 
@@ -20 +20 @@
     from the moment request is sent over the wire.
 
-diff -r 60dcf9e2441b wokkel/subprotocols.py
---- a/wokkel/subprotocols.py    Mon Feb 28 21:04:37 2011 +0100
-+++ b/wokkel/subprotocols.py    Fri Mar 04 09:45:24 2011 +0100
+diff -r 6f36a7f92973 wokkel/subprotocols.py
+--- a/wokkel/subprotocols.py    Thu Jul 28 20:14:02 2011 +0200
++++ b/wokkel/subprotocols.py    Wed Aug 03 09:45:01 2011 +0200
 @@ -156,11 +156,23 @@
      @type _initialized: C{bool}
@@ -73 +73 @@
          for p in self._packetQueue:
              xs.send(p)
-@@ -268,6 +291,34 @@
+@@ -268,6 +291,31 @@
          for e in list(self):
              e.connectionLost(reason)
@@ -90 +90 @@
 +        Handle iq response by firing associated deferred.
 +        """
-+        if getattr(iq, 'handled', False):
-+            return
-+
 +        try:
 +            d = self._iqDeferreds[iq["id"]]
@@ -108 +105 @@
      def send(self, obj):
          """
-@@ -285,6 +336,68 @@
+@@ -285,6 +333,68 @@
              self._packetQueue.append(obj)
  
@@ -141 +138 @@
 +        if (request.stanzaKind != 'iq' or
 +            request.stanzaType not in ('get', 'set')):
-+            return defer.fail(Exception("Not a request"))
++            return defer.fail(ValueError("Not a request"))
 +
 +        element = request.toElement()
@@ -154 +151 @@
 +        self._iqDeferreds[element['id']] = d
 +
-+        timeout = request.timeout or self.timeout
++        timeout = getattr(request, 'timeout', self.timeout)
 +
 +        if timeout is not None:
@@ -177 +174 @@
  class IQHandlerMixin(object):
      """
-diff -r 60dcf9e2441b wokkel/test/test_subprotocols.py
---- a/wokkel/test/test_subprotocols.py  Mon Feb 28 21:04:37 2011 +0100
-+++ b/wokkel/test/test_subprotocols.py  Fri Mar 04 09:45:24 2011 +0100
+diff -r 6f36a7f92973 wokkel/test/test_subprotocols.py
+--- a/wokkel/test/test_subprotocols.py  Thu Jul 28 20:14:02 2011 +0200
++++ b/wokkel/test/test_subprotocols.py  Wed Aug 03 09:45:01 2011 +0200
 @@ -9,12 +9,13 @@
  
@@ -196 +193 @@
  class DummyFactory(object):
      """
-@@ -164,20 +165,48 @@
+@@ -164,20 +165,46 @@
  
  
  
 +class IQGetStanza(generic.Stanza):
-+    timeout = None
-+
 +    stanzaKind = 'iq'
 +    stanzaType = 'get'
@@ -248 +243 @@
          self.assertEquals([], sm.handlers)
          self.assertEquals(sm._connected,
-@@ -407,6 +436,7 @@
+@@ -407,6 +434,7 @@
          self.assertEquals(0, handler.nestedHandler.doneLost)
  
@@ -256 +251 @@
          """
          Test removal of protocol handler.
-@@ -418,6 +448,7 @@
+@@ -418,6 +446,7 @@
          self.assertNotIn(handler, sm)
          self.assertIdentical(None, handler.parent)
@@ -264 +259 @@
          """
          Test send when the stream has been initialized.
-@@ -509,6 +540,194 @@
+@@ -509,6 +538,228 @@
          self.assertEquals("<presence/>", sm._packetQueue[0])
  
@@ -449 +444 @@
 +        d = self.streamManager.request(self.request)
 +
-+        xs = self.xmlstream
 +        self.xmlstream.connectionLost(failure.Failure(ConnectionDone()))
 +        self.assertFailure(d, ConnectionDone)
@@ -456 +450 @@
 +
 +
++    def test_requestNotIQ(self):
++        """
++        The request stanza must be an iq.
++        """
++        stanza = generic.Stanza()
++        stanza.stanzaKind = 'message'
++
++        d = self.streamManager.request(stanza)
++        self.assertFailure(d, ValueError)
++
++
++    def test_requestNotResult(self):
++        """
++        The request stanza cannot be of type 'result'.
++        """
++        stanza = generic.Stanza()
++        stanza.stanzaKind = 'iq'
++        stanza.stanzaType = 'result'
++
++        d = self.streamManager.request(stanza)
++        self.assertFailure(d, ValueError)
++
++
++    def test_requestNotError(self):
++        """
++        The request stanza cannot be of type 'error'.
++        """
++        stanza = generic.Stanza()
++        stanza.stanzaKind = 'iq'
++        stanza.stanzaType = 'error'
++
++        d = self.streamManager.request(stanza)
++        self.assertFailure(d, ValueError)
++
++
  
  class DummyIQHandler(subprotocols.IQHandlerMixin):