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_roster.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_roster.py')
| -rw-r--r-- | tests/test_stream_roster.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tests/test_stream_roster.py b/tests/test_stream_roster.py index f5617fb6..dffd6713 100644 --- a/tests/test_stream_roster.py +++ b/tests/test_stream_roster.py @@ -19,12 +19,12 @@ class TestStreamRoster(SleekTest): t = threading.Thread(name='get_roster', target=self.xmpp.get_roster) t.start() - self.stream_send_iq(""" + self.send(""" <iq type="get" id="1"> <query xmlns="jabber:iq:roster" /> </iq> """) - self.stream_recv(""" + self.recv(""" <iq to='tester@localhost' type="result" id="1"> <query xmlns="jabber:iq:roster"> <item jid="user@localhost" @@ -41,7 +41,6 @@ class TestStreamRoster(SleekTest): # Wait for get_roster to return. t.join() - print self.xmpp.roster['tester@localhost']['user@localhost']._state self.check_roster('tester@localhost', 'user@localhost', name='User', subscription='from', @@ -53,7 +52,7 @@ class TestStreamRoster(SleekTest): """Test handling pushed roster updates.""" self.stream_start(mode='client', jid='tester@localhost') - self.stream_recv(""" + self.recv(""" <iq to='tester@localhost' type="set" id="1"> <query xmlns="jabber:iq:roster"> <item jid="user@localhost" @@ -65,7 +64,7 @@ class TestStreamRoster(SleekTest): </query> </iq> """) - self.stream_send_iq(""" + self.send(""" <iq type="result" id="1"> <query xmlns="jabber:iq:roster" /> </iq> |