Corrected stream header tester.

Added test for testing stream headers.
skinkie · Oct 6, 2010 · 88d21d2 · 88d21d2
1 parent 799645f
commit 88d21d2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/tests/sleektest.py b/tests/sleektest.py
@@ -378,7 +378,6 @@ def streamStart(self, mode='client', skip=True, header=None):
         self.xmpp.socket.recvData(header)
 
         self.xmpp.connect = lambda a=None, b=None, c=None, d=None: True
-        self.xmpp.start_tls = lambda: True
         self.xmpp.process(threaded=True)
         if skip:
             # Clear startup stanzas
@@ -420,6 +419,7 @@ def makeStreamHeader(self, sto='',
                           appended before the stream header.
         """
         header = '<stream:stream %s>'
+        parts = []
         if xml_header:
             header = '<?xml version="1.0"?>' + header
         if sto:
@@ -467,8 +467,8 @@ def streamSendHeader(self, sto='',
 
         # Apply closing elements so that we can construct
         # XML objects for comparison.
-        header2 += '</stream:stream>'
-        sent_header2 += '</stream:stream>'
+        header2 = header + '</stream:stream>'
+        sent_header2 = sent_header + '</stream:stream>'
 
         xml = ET.fromstring(header2)
         sent_xml = ET.fromstring(sent_header2)

diff --git a/tests/test_streamtester.py b/tests/test_streamtester.py
@@ -16,15 +16,15 @@ def testClientEcho(self):
 
         def echo(msg):
             msg.reply('Thanks for sending: %(body)s' % msg).send()
-        
+
         self.xmpp.add_event_handler('message', echo)
-        
+
         self.streamRecv("""
           <message to="tester@localhost" from="user@localhost">
             <body>Hi!</body>
           </message>
         """)
-        
+
         self.streamSendMessage("""
           <message to="user@localhost">
             <body>Thanks for sending: Hi!</body>
@@ -52,4 +52,9 @@ def echo(msg):
           </message>
         """)
 
+    def testSendStreamHeader(self):
+        """Test that we can check a sent stream header."""
+        self.streamStart(mode='client', skip=False)
+        self.streamSendHeader(sto='localhost')
+
 suite = unittest.TestLoader().loadTestsFromTestCase(TestStreamTester)