diff --git a/tests/sleektest.py b/tests/sleektest.py index e7951892a..e08a8debf 100644 --- 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 = '' + parts = [] if xml_header: header = '' + header if sto: @@ -467,8 +467,8 @@ def streamSendHeader(self, sto='', # Apply closing elements so that we can construct # XML objects for comparison. - header2 += '' - sent_header2 += '' + header2 = header + '' + sent_header2 = sent_header + '' xml = ET.fromstring(header2) sent_xml = ET.fromstring(sent_header2) diff --git a/tests/test_streamtester.py b/tests/test_streamtester.py index 8512f4011..8a4f82dd7 100644 --- 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(""" Hi! """) - + self.streamSendMessage(""" Thanks for sending: Hi! @@ -52,4 +52,9 @@ def echo(msg): """) + 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)