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_stanza_xep_0030.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_stanza_xep_0030.py')
| -rw-r--r-- | tests/test_stanza_xep_0030.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/test_stanza_xep_0030.py b/tests/test_stanza_xep_0030.py index c61583bf..e367c8d9 100644 --- a/tests/test_stanza_xep_0030.py +++ b/tests/test_stanza_xep_0030.py @@ -14,7 +14,7 @@ class TestDisco(SleekTest): iq['id'] = "0" iq['disco_info']['node'] = '' - self.check_iq(iq, """ + self.check(iq, """ <iq id="0"> <query xmlns="http://jabber.org/protocol/disco#info" /> </iq> @@ -26,7 +26,7 @@ class TestDisco(SleekTest): iq['id'] = "0" iq['disco_info']['node'] = 'foo' - self.check_iq(iq, """ + self.check(iq, """ <iq id="0"> <query xmlns="http://jabber.org/protocol/disco#info" node="foo" /> </iq> @@ -38,7 +38,7 @@ class TestDisco(SleekTest): iq['id'] = "0" iq['disco_items']['node'] = '' - self.check_iq(iq, """ + self.check(iq, """ <iq id="0"> <query xmlns="http://jabber.org/protocol/disco#items" /> </iq> @@ -50,7 +50,7 @@ class TestDisco(SleekTest): iq['id'] = "0" iq['disco_items']['node'] = 'foo' - self.check_iq(iq, """ + self.check(iq, """ <iq id="0"> <query xmlns="http://jabber.org/protocol/disco#items" node="foo" /> </iq> @@ -63,7 +63,7 @@ class TestDisco(SleekTest): iq['disco_info']['node'] = 'foo' iq['disco_info'].addIdentity('conference', 'text', 'Chatroom') - self.check_iq(iq, """ + self.check(iq, """ <iq id="0"> <query xmlns="http://jabber.org/protocol/disco#info" node="foo"> <identity category="conference" type="text" name="Chatroom" /> @@ -79,7 +79,7 @@ class TestDisco(SleekTest): iq['disco_info'].addFeature('foo') iq['disco_info'].addFeature('bar') - self.check_iq(iq, """ + self.check(iq, """ <iq id="0"> <query xmlns="http://jabber.org/protocol/disco#info" node="foo"> <feature var="foo" /> @@ -97,7 +97,7 @@ class TestDisco(SleekTest): iq['disco_items'].addItem('user@localhost', 'foo') iq['disco_items'].addItem('user@localhost', 'bar', 'Testing') - self.check_iq(iq, """ + self.check(iq, """ <iq id="0"> <query xmlns="http://jabber.org/protocol/disco#items" node="foo"> <item jid="user@localhost" /> |