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_exceptions.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_exceptions.py')
| -rw-r--r-- | tests/test_stream_exceptions.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/test_stream_exceptions.py b/tests/test_stream_exceptions.py index f788a3a4..b7be6485 100644 --- a/tests/test_stream_exceptions.py +++ b/tests/test_stream_exceptions.py @@ -26,13 +26,13 @@ class TestStreamExceptions(SleekTest): self.stream_start() self.xmpp.add_event_handler('message', message) - self.stream_recv(""" + self.recv(""" <message> <body>This is going to cause an error.</body> </message> """) - self.stream_send_message(""" + self.send(""" <message type="error"> <error type="cancel"> <feature-not-implemented @@ -57,13 +57,13 @@ class TestStreamExceptions(SleekTest): self.xmpp.add_event_handler('message', message, threaded=True) - self.stream_recv(""" + self.recv(""" <message> <body>This is going to cause an error.</body> </message> """) - self.stream_send_message(""" + self.send(""" <message type="error"> <error type="cancel"> <feature-not-implemented @@ -84,14 +84,14 @@ class TestStreamExceptions(SleekTest): self.stream_start() self.xmpp.add_event_handler('message', message) - self.stream_recv(""" + self.recv(""" <message> <body>This is going to cause an error.</body> </message> """) if sys.version_info < (3, 0): - self.stream_send_message(""" + self.send(""" <message type="error"> <error type="cancel"> <undefined-condition |