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_handlers.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_handlers.py')
| -rw-r--r-- | tests/test_stream_handlers.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/test_stream_handlers.py b/tests/test_stream_handlers.py index 8c05572a..2b878b37 100644 --- a/tests/test_stream_handlers.py +++ b/tests/test_stream_handlers.py @@ -30,11 +30,11 @@ class TestHandlers(SleekTest): self.xmpp.registerHandler(callback) - self.stream_recv("""<tester xmlns="test" />""") + self.recv("""<tester xmlns="test" />""") msg = self.Message() msg['body'] = 'Success!' - self.stream_send_message(msg) + self.send(msg) def testWaiter(self): """Test using stream waiter handler.""" @@ -55,7 +55,7 @@ class TestHandlers(SleekTest): self.xmpp.add_event_handler('message', waiter_handler, threaded=True) # Send message to trigger waiter_handler - self.stream_recv(""" + self.recv(""" <message> <body>Testing</body> </message> @@ -66,10 +66,10 @@ class TestHandlers(SleekTest): iq['id'] = 'test' iq['type'] = 'set' iq['query'] = 'test' - self.stream_send_iq(iq) + self.send(iq) # Send the reply Iq - self.stream_recv(""" + self.recv(""" <iq id="test" type="result"> <query xmlns="test" /> </iq> @@ -78,7 +78,7 @@ class TestHandlers(SleekTest): # Check that waiter_handler received the reply msg = self.Message() msg['body'] = 'Successful: test' - self.stream_send_message(msg) + self.send(msg) def testWaiterTimeout(self): """Test that waiter handler is removed after timeout.""" @@ -93,14 +93,14 @@ class TestHandlers(SleekTest): self.xmpp.add_event_handler('message', waiter_handler, threaded=True) # Start test by triggerig waiter_handler - self.stream_recv("""<message><body>Start Test</body></message>""") + self.recv("""<message><body>Start Test</body></message>""") # Check that Iq was sent to trigger start of timeout period iq = self.Iq() iq['id'] = 'test2' iq['type'] = 'set' iq['query'] = 'test2' - self.stream_send_iq(iq) + self.send(iq) # Check that the waiter is no longer registered waiter_exists = self.xmpp.removeHandler('IqWait_test2') |