summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-04-08 16:52:20 -0400
committerLance Stout <lancestout@gmail.com>2011-04-08 16:52:20 -0400
commitb60c51ef13382c60ffc6f6f2eddea2a28cfd1c8c (patch)
tree8c02fb1471a5a9f8cac686f9df1d54ca886dd821
parent6b0593857352c851ce2e55743802ab5fbdd81f5f (diff)
parentf02b0564e0cf664364cd6694a5df6d588071ec62 (diff)
downloadslixmpp-b60c51ef13382c60ffc6f6f2eddea2a28cfd1c8c.tar.gz
slixmpp-b60c51ef13382c60ffc6f6f2eddea2a28cfd1c8c.tar.bz2
slixmpp-b60c51ef13382c60ffc6f6f2eddea2a28cfd1c8c.tar.xz
slixmpp-b60c51ef13382c60ffc6f6f2eddea2a28cfd1c8c.zip
Merge branch 'develop' into roster
-rw-r--r--tests/test_stanza_error.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/test_stanza_error.py b/tests/test_stanza_error.py
index e1c7d5a4..5eecfee9 100644
--- a/tests/test_stanza_error.py
+++ b/tests/test_stanza_error.py
@@ -9,7 +9,7 @@ class TestErrorStanzas(SleekTest):
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 +22,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 +34,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 +50,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 +66,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>