diff options
| author | Lance Stout <lancestout@gmail.com> | 2010-10-06 18:46:23 -0400 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2010-10-06 18:46:23 -0400 |
| commit | 88d21d210c15d76000b6a3c69e47a55b1582d054 (patch) | |
| tree | 8d3a0b81e88980844da2a56efa90e26c701b3737 /tests | |
| parent | 799645f13fb0f8cfac5392594d992a7e951d2273 (diff) | |
| download | slixmpp-88d21d210c15d76000b6a3c69e47a55b1582d054.tar.gz slixmpp-88d21d210c15d76000b6a3c69e47a55b1582d054.tar.bz2 slixmpp-88d21d210c15d76000b6a3c69e47a55b1582d054.tar.xz slixmpp-88d21d210c15d76000b6a3c69e47a55b1582d054.zip | |
Corrected stream header tester.
Added test for testing stream headers.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/sleektest.py | 6 | ||||
| -rw-r--r-- | tests/test_streamtester.py | 11 |
2 files changed, 11 insertions, 6 deletions
diff --git a/tests/sleektest.py b/tests/sleektest.py index e7951892..e08a8deb 100644 --- a/tests/sleektest.py +++ b/tests/sleektest.py @@ -378,7 +378,6 @@ class SleekTest(unittest.TestCase): 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 @@ class SleekTest(unittest.TestCase): 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 @@ class SleekTest(unittest.TestCase): # 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 index 8512f401..8a4f82dd 100644 --- a/tests/test_streamtester.py +++ b/tests/test_streamtester.py @@ -16,15 +16,15 @@ class TestStreamTester(SleekTest): 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 @@ class TestStreamTester(SleekTest): </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) |