diff options
| author | Lance Stout <lancestout@gmail.com> | 2010-11-17 02:00:20 -0500 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2010-11-17 02:01:12 -0500 |
| commit | 26aca2b789f62123819041229ba40ab10268f49e (patch) | |
| tree | 20388fb0559ed85f7143eb3b8a669142cdc43f6b /tests/test_stream.py | |
| parent | 4f69a03bb1a8caab7899bd04f97b7975a78f2f34 (diff) | |
| parent | 5424ede413393db5b835686e8544a9b703fb113b (diff) | |
| download | slixmpp-26aca2b789f62123819041229ba40ab10268f49e.tar.gz slixmpp-26aca2b789f62123819041229ba40ab10268f49e.tar.bz2 slixmpp-26aca2b789f62123819041229ba40ab10268f49e.tar.xz slixmpp-26aca2b789f62123819041229ba40ab10268f49e.zip | |
Merge branch 'roster' of github.com:fritzy/SleekXMPP into roster
Conflicts:
sleekxmpp/basexmpp.py
sleekxmpp/roster.py
sleekxmpp/test/sleektest.py
tests/test_stream_presence.py
tests/test_stream_roster.py
Diffstat (limited to 'tests/test_stream.py')
| -rw-r--r-- | tests/test_stream.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/test_stream.py b/tests/test_stream.py index 3fbf86e6..f91f71f9 100644 --- a/tests/test_stream.py +++ b/tests/test_stream.py @@ -19,13 +19,13 @@ class TestStreamTester(SleekTest): self.xmpp.add_event_handler('message', echo) - self.stream_recv(""" + self.recv(""" <message to="tester@localhost" from="user@localhost"> <body>Hi!</body> </message> """) - self.stream_send_message(""" + self.send(""" <message to="user@localhost"> <body>Thanks for sending: Hi!</body> </message> @@ -40,13 +40,13 @@ class TestStreamTester(SleekTest): self.xmpp.add_event_handler('message', echo) - self.stream_recv(""" + self.recv(""" <message to="tester.localhost" from="user@localhost"> <body>Hi!</body> </message> """) - self.stream_send_message(""" + self.send(""" <message to="user@localhost" from="tester.localhost"> <body>Thanks for sending: Hi!</body> </message> @@ -55,6 +55,6 @@ class TestStreamTester(SleekTest): def testSendStreamHeader(self): """Test that we can check a sent stream header.""" self.stream_start(mode='client', skip=False) - self.stream_send_header(sto='localhost') + self.send_header(sto='localhost') suite = unittest.TestLoader().loadTestsFromTestCase(TestStreamTester) |