summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-04-11 14:23:47 -0400
committerLance Stout <lancestout@gmail.com>2011-04-11 14:23:47 -0400
commitea8c40c7b637d656a596e16555a0d8695932a06f (patch)
tree35aeab627f7f66120fc1df790c0376ce005cbe24 /tests
parentae5ce170355de59cfd7913f85f7444f2f92bf21a (diff)
parent1d891858b63c1e3ac10a39920c3e65159cfc8d72 (diff)
downloadslixmpp-ea8c40c7b637d656a596e16555a0d8695932a06f.tar.gz
slixmpp-ea8c40c7b637d656a596e16555a0d8695932a06f.tar.bz2
slixmpp-ea8c40c7b637d656a596e16555a0d8695932a06f.tar.xz
slixmpp-ea8c40c7b637d656a596e16555a0d8695932a06f.zip
Merge branch 'develop' into stream_features
Diffstat (limited to 'tests')
-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>