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_iq.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_iq.py')
| -rw-r--r-- | tests/test_stanza_iq.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/test_stanza_iq.py b/tests/test_stanza_iq.py index 3f6ce8d7..42e4dcde 100644 --- a/tests/test_stanza_iq.py +++ b/tests/test_stanza_iq.py @@ -11,7 +11,7 @@ class TestIqStanzas(SleekTest): def testSetup(self): """Test initializing default Iq values.""" iq = self.Iq() - self.check_iq(iq, """ + self.check(iq, """ <iq id="0" /> """) @@ -19,7 +19,7 @@ class TestIqStanzas(SleekTest): """Test setting Iq stanza payload.""" iq = self.Iq() iq.setPayload(ET.Element('{test}tester')) - self.check_iq(iq, """ + self.check(iq, """ <iq id="0"> <tester xmlns="test" /> </iq> @@ -29,7 +29,7 @@ class TestIqStanzas(SleekTest): def testUnhandled(self): """Test behavior for Iq.unhandled.""" self.stream_start() - self.stream_recv(""" + self.recv(""" <iq id="test" type="get"> <query xmlns="test" /> </iq> @@ -40,7 +40,7 @@ class TestIqStanzas(SleekTest): iq['error']['condition'] = 'feature-not-implemented' iq['error']['text'] = 'No handlers registered for this request.' - self.stream_send_iq(iq, """ + self.send(iq, """ <iq id="test" type="error"> <error type="cancel"> <feature-not-implemented xmlns="urn:ietf:params:xml:ns:xmpp-stanzas" /> @@ -56,14 +56,14 @@ class TestIqStanzas(SleekTest): iq = self.Iq() iq['query'] = 'query_ns' - self.check_iq(iq, """ + self.check(iq, """ <iq id="0"> <query xmlns="query_ns" /> </iq> """) iq['query'] = 'query_ns2' - self.check_iq(iq, """ + self.check(iq, """ <iq id="0"> <query xmlns="query_ns2" /> </iq> @@ -72,7 +72,7 @@ class TestIqStanzas(SleekTest): self.failUnless(iq['query'] == 'query_ns2', "Query namespace doesn't match") del iq['query'] - self.check_iq(iq, """ + self.check(iq, """ <iq id="0" /> """) @@ -83,7 +83,7 @@ class TestIqStanzas(SleekTest): iq['type'] = 'get' iq.reply() - self.check_iq(iq, """ + self.check(iq, """ <iq id="0" type="result" /> """) |