Changeset 79:0752a1cca356 in ralphm-patches for server-stream-manager.patch

Timestamp:

Jun 22, 2016, 4:43:00 PM (4 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Message:

Split out stanza module and response tracking patches, fix other patches.

File:

• server-stream-manager.patch (modified) (28 diffs)

server-stream-manager.patch

@@ -1 +1 @@
 # HG changeset patch
 # Parent 3f3fe954b1975c2d9115e0fa8177ae7b28a708a8
+# Parent  e198cebf36146a768eda902efa5ee741e947fda8
 Generalize StreamManager and add ServerStreamManager.
 
@@ -35 +36 @@
 --- a/wokkel/subprotocols.py
 +++ b/wokkel/subprotocols.py
-@@ -118,7 +118,7 @@
+@@ -122,7 +122,7 @@
  
  
@@ -44 +45 @@
      Business logic representing a managed XMPP connection.
  
-@@ -129,43 +129,39 @@
+@@ -133,43 +133,39 @@
  
      @ivar xmlstream: currently managed XML stream
@@ -95 +96 @@
              from twisted.internet import reactor
          self._reactor = reactor
-@@ -191,7 +187,7 @@
+@@ -195,7 +191,7 @@
              handler.connectionInitialized()
  
@@ -104 +105 @@
          Called when the transport connection has been established.
  
-@@ -209,13 +205,17 @@
+@@ -213,13 +209,17 @@
              xs.rawDataInFn = logDataIn
              xs.rawDataOutFn = logDataOut
@@ -123 +124 @@
          Called when the stream has been initialized.
  
-@@ -238,21 +238,8 @@
+@@ -242,21 +242,8 @@
              e.connectionInitialized()
  
@@ -146 +147 @@
          Called when the stream has been closed.
  
-@@ -379,6 +366,60 @@
+@@ -468,6 +455,60 @@
  
  
@@ -233 +234 @@
 --- a/wokkel/test/test_subprotocols.py
 +++ b/wokkel/test/test_subprotocols.py
-@@ -189,20 +189,7 @@
+@@ -190,22 +190,7 @@
  
  
@@ -250 +251 @@
 -        self.xmlstream.transport = self.transport
 -
--        self.request = IQGetStanza()
+-        self.request = IQGetStanza(recipient=JID('other@example.org'),
+-                                   sender=JID('user@example.org'))
+-
 +class BaseStreamManagerTestsMixin(object):
  
      def _streamStarted(self):
          """
-@@ -216,25 +203,14 @@
+@@ -219,25 +204,14 @@
          self.xmlstream.dispatch(self.xmlstream, "//event/stream/authd")
  
@@ -285 +288 @@
          Test that protocol handlers have their connectionMade method called
          when the XML stream is connected.
-@@ -242,27 +218,27 @@
+@@ -245,27 +219,27 @@
          sm = self.streamManager
          handler = DummyXMPPHandler()
@@ -319 +322 @@
          Test raw data functions set when logTraffic is set to True.
          """
-@@ -270,13 +246,13 @@
+@@ -273,13 +247,13 @@
          sm.logTraffic = True
          handler = DummyXMPPHandler()
@@ -336 +339 @@
          Test that protocol handlers have their connectionInitialized method
          called when the XML stream is initialized.
-@@ -284,27 +260,27 @@
+@@ -287,27 +261,27 @@
          sm = self.streamManager
          handler = DummyXMPPHandler()
@@ -369 +372 @@
          A L{STREAM_END_EVENT} results in L{StreamManager} firing the handlers
          L{connectionLost} methods, passing a L{failure.Failure} reason.
-@@ -313,7 +289,7 @@
+@@ -316,7 +290,7 @@
          handler = FailureReasonXMPPHandler()
          handler.setHandlerParent(sm)
@@ -378 +381 @@
  
  
-@@ -335,8 +311,8 @@
+@@ -338,8 +312,8 @@
          Adding a handler when connected doesn't call connectionInitialized.
          """
@@ -389 +392 @@
          handler.setHandlerParent(sm)
  
-@@ -358,10 +334,10 @@
+@@ -361,10 +335,10 @@
                  self.nestedHandler.setHandlerParent(self.parent)
  
@@ -402 +405 @@
          self.assertEquals(1, handler.doneMade)
          self.assertEquals(0, handler.doneInitialized)
-@@ -383,9 +359,9 @@
+@@ -386,9 +360,9 @@
          called.
          """
@@ -415 +418 @@
          handler.setHandlerParent(sm)
  
-@@ -407,11 +383,11 @@
+@@ -410,11 +384,11 @@
                  self.nestedHandler.setHandlerParent(self.parent)
  
@@ -430 +433 @@
          self.assertEquals(1, handler.doneMade)
          self.assertEquals(1, handler.doneInitialized)
-@@ -435,12 +411,12 @@
+@@ -438,12 +412,12 @@
                  self.nestedHandler.setHandlerParent(self.parent)
  
@@ -447 +450 @@
          self.assertEquals(1, handler.doneMade)
          self.assertEquals(1, handler.doneInitialized)
-@@ -470,16 +446,13 @@
+@@ -473,16 +447,13 @@
  
          The data should be sent directly over the XML stream.
@@ -466 +469 @@
  
  
-@@ -490,12 +463,11 @@
+@@ -493,12 +464,11 @@
          The data should be cached until an XML stream has been established and
          initialized.
@@ -481 +484 @@
          sm.send("<presence/>")
          self.assertEquals("", xs.transport.value())
-@@ -522,7 +494,7 @@
+@@ -525,7 +495,7 @@
          """
          factory = xmlstream.XmlStreamFactory(xmlstream.Authenticator())
@@ -490 +493 @@
          xs.connectionMade()
          xs.dataReceived("<stream:stream xmlns='jabber:client' "
-@@ -545,7 +517,7 @@
+@@ -548,7 +518,7 @@
          handler = DummyXMPPHandler()
          sm.addHandler(handler)
@@ -499 +502 @@
          xs.transport = proto_helpers.StringTransport()
          xs.connectionLost(None)
-@@ -677,6 +649,7 @@
+@@ -720,6 +690,7 @@
          """
          d = self.streamManager.request(self.request)
@@ -507 +510 @@
          self.assertFailure(d, ConnectionDone)
          return d
-@@ -692,6 +665,7 @@
+@@ -735,6 +706,7 @@
              d = xmlstream.IQ(self.xmlstream).send()
              d.addErrback(eb)
@@ -515 +518 @@
          d.addErrback(eb)
          self.xmlstream.connectionLost(failure.Failure(ConnectionDone()))
-@@ -736,6 +710,7 @@
+@@ -780,6 +752,7 @@
          self.request.timeout = 60
          d = self.streamManager.request(self.request)
@@ -523 +526 @@
          self.assertFailure(d, ConnectionDone)
          self.assertFalse(self.clock.calls)
-@@ -778,6 +753,56 @@
+@@ -822,6 +795,58 @@
  
  
@@ -540 +543 @@
 +        self.xmlstream.transport = self.transport
 +
-+        self.request = IQGetStanza()
++        self.request = IQGetStanza(recipient=JID('other@example.org'),
++                                   sender=JID('user@example.org'))
 +
 +
@@ -573 +577 @@
 +                                   self.streamManager.makeConnection)
 +
-+        self.request = IQGetStanza()
++        self.request = IQGetStanza(recipient=JID('other@example.org'),
++                                   sender=JID('user@example.org'))
 +
 +