Changeset 74:355afce3af27 in ralphm-patches for server-stream-manager.patch

Timestamp:

Aug 19, 2014, 4:31:19 PM (8 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Message:

Refactor Component to match changes to StreamManager?.

File:

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

server-stream-manager.patch

@@ -1 +1 @@
 # HG changeset patch
-# Parent 3f3fe954b1975c2d9115e0fa8177ae7b28a708a8
+# Parent 71082c22f73200a0b8b4b5c6e5d2773f9f68dd4d
 Generalize StreamManager and add ServerStreamManager.
 
@@ -32 +32 @@
  
      def initializationFailed(self, reason):
+diff --git a/wokkel/component.py b/wokkel/component.py
+--- a/wokkel/component.py
++++ b/wokkel/component.py
+@@ -36,7 +36,7 @@
+         StreamManager.__init__(self, factory)
+ 
+ 
+-    def _authd(self, xs):
++    def connectionInitialized(self, xs):
+         """
+         Called when stream initialization has completed.
+ 
+@@ -53,7 +53,7 @@
+             old_send(obj)
+ 
+         xs.send = send
+-        StreamManager._authd(self, xs)
++        StreamManager.connectionInitialized(self, xs)
+ 
+ 
+     def initializationFailed(self, reason):
 diff --git a/wokkel/subprotocols.py b/wokkel/subprotocols.py
 --- a/wokkel/subprotocols.py
 +++ b/wokkel/subprotocols.py
-@@ -118,7 +118,7 @@
+@@ -120,7 +120,7 @@
  
  
@@ -44 +65 @@
      Business logic representing a managed XMPP connection.
  
-@@ -129,43 +129,39 @@
+@@ -131,43 +131,39 @@
  
      @ivar xmlstream: currently managed XML stream
@@ -95 +116 @@
              from twisted.internet import reactor
          self._reactor = reactor
-@@ -191,7 +187,7 @@
+@@ -193,7 +189,7 @@
              handler.connectionInitialized()
  
@@ -104 +125 @@
          Called when the transport connection has been established.
  
-@@ -209,13 +205,17 @@
+@@ -211,13 +207,17 @@
              xs.rawDataInFn = logDataIn
              xs.rawDataOutFn = logDataOut
@@ -123 +144 @@
          Called when the stream has been initialized.
  
-@@ -238,21 +238,8 @@
+@@ -240,21 +240,8 @@
              e.connectionInitialized()
  
@@ -146 +167 @@
          Called when the stream has been closed.
  
-@@ -379,6 +366,60 @@
+@@ -464,6 +451,60 @@
  
  
@@ -230 +251 @@
  
  
+diff --git a/wokkel/test/test_component.py b/wokkel/test/test_component.py
+--- a/wokkel/test/test_component.py
++++ b/wokkel/test/test_component.py
+@@ -49,11 +49,18 @@
+     def __init__(self, *args, **kwargs):
+         component.Component.__init__(self, *args, **kwargs)
+         self.factory.clock = Clock()
++        self.output = []
+ 
+ 
+     def _getConnection(self):
+         c = FakeConnector(self.factory, None, None)
+         c.connect()
++        xs = self.factory.buildProtocol(None)
++        xs.send = self.output.append
++        xs.connectionMade()
++        self.makeConnection(xs)
++        xs.thisEntity = xs.otherEntity
++        xs.dispatch(xs, xmlstream.STREAM_AUTHD_EVENT)
+         return c
+ 
+ 
+@@ -104,6 +111,21 @@
+         self.assertEqual(1, connector.connects)
+ 
+ 
++    def test_stampFrom(self):
++        """
++        Outgoing elements with missing sender address get component JID.
++        """
++        comp = TestableComponent('example.org', 5347,
++                                 'test.example.org', 'secret')
++        comp.startService()
++
++        element = domish.Element((component.NS_COMPONENT_ACCEPT, "message"))
++        element["to"] = "test@example.org"
++        comp.xmlstream.send(element)
++
++        self.assertEqual('test.example.org', element.getAttribute("from"))
++
++
+ 
+ class InternalComponentTest(unittest.TestCase):
+     """
 diff --git a/wokkel/test/test_subprotocols.py b/wokkel/test/test_subprotocols.py
 --- a/wokkel/test/test_subprotocols.py