diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-05-20 13:26:21 -0400 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-05-20 13:26:21 -0400 |
| commit | e2de82ac8d45d2a6709154ef27dbeb3d08ce1a76 (patch) | |
| tree | f1eba0699b6a3a2752cb04a6299ab5e8e5006574 /tests/test_stanza_error.py | |
| parent | f125c11a810cf308473394262879f94166c3f564 (diff) | |
| parent | 9f1648328f17b608651989606b9cf2636cdcfbec (diff) | |
| download | slixmpp-e2de82ac8d45d2a6709154ef27dbeb3d08ce1a76.tar.gz slixmpp-e2de82ac8d45d2a6709154ef27dbeb3d08ce1a76.tar.bz2 slixmpp-e2de82ac8d45d2a6709154ef27dbeb3d08ce1a76.tar.xz slixmpp-e2de82ac8d45d2a6709154ef27dbeb3d08ce1a76.zip | |
Merge branch 'develop' into stream_features
Conflicts:
sleekxmpp/clientxmpp.py
Diffstat (limited to 'tests/test_stanza_error.py')
| -rw-r--r-- | tests/test_stanza_error.py | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/tests/test_stanza_error.py b/tests/test_stanza_error.py index e1c7d5a4..a41bf4bf 100644 --- a/tests/test_stanza_error.py +++ b/tests/test_stanza_error.py @@ -3,13 +3,18 @@ from sleekxmpp.test import * class TestErrorStanzas(SleekTest): + def setUp(self): + # Ensure that the XEP-0086 plugin has been loaded. + self.stream_start() + self.stream_close() + def testSetup(self): """Test setting initial values in error stanza.""" msg = self.Message() msg.enable('error') self.check(msg, """ <message type="error"> - <error type="cancel"> + <error type="cancel" code="501"> <feature-not-implemented xmlns="urn:ietf:params:xml:ns:xmpp-stanzas" /> </error> </message> @@ -22,7 +27,7 @@ class TestErrorStanzas(SleekTest): self.check(msg, """ <message type="error"> - <error type="cancel"> + <error type="cancel" code="404"> <item-not-found xmlns="urn:ietf:params:xml:ns:xmpp-stanzas" /> </error> </message> @@ -34,7 +39,7 @@ class TestErrorStanzas(SleekTest): self.check(msg, """ <message type="error"> - <error type="cancel"> + <error type="wait" code="500"> <resource-constraint xmlns="urn:ietf:params:xml:ns:xmpp-stanzas" /> </error> </message> @@ -50,7 +55,7 @@ class TestErrorStanzas(SleekTest): self.check(msg, """ <message type="error"> - <error type="cancel"> + <error type="wait" code="500"> <text xmlns="urn:ietf:params:xml:ns:xmpp-stanzas">Error!</text> </error> </message> @@ -66,7 +71,7 @@ class TestErrorStanzas(SleekTest): self.check(msg, """ <message type="error"> - <error type="cancel"> + <error type="wait" code="500"> <internal-server-error xmlns="urn:ietf:params:xml:ns:xmpp-stanzas" /> </error> </message> |