Merge branch 'develop' into roster

This commit is contained in:
Lance Stout 2011-04-08 16:52:20 -04:00
commit b60c51ef13

View file

@ -9,7 +9,7 @@ class TestErrorStanzas(SleekTest):
msg.enable('error') msg.enable('error')
self.check(msg, """ self.check(msg, """
<message type="error"> <message type="error">
<error type="cancel"> <error type="cancel" code="501">
<feature-not-implemented xmlns="urn:ietf:params:xml:ns:xmpp-stanzas" /> <feature-not-implemented xmlns="urn:ietf:params:xml:ns:xmpp-stanzas" />
</error> </error>
</message> </message>
@ -22,7 +22,7 @@ class TestErrorStanzas(SleekTest):
self.check(msg, """ self.check(msg, """
<message type="error"> <message type="error">
<error type="cancel"> <error type="cancel" code="404">
<item-not-found xmlns="urn:ietf:params:xml:ns:xmpp-stanzas" /> <item-not-found xmlns="urn:ietf:params:xml:ns:xmpp-stanzas" />
</error> </error>
</message> </message>
@ -34,7 +34,7 @@ class TestErrorStanzas(SleekTest):
self.check(msg, """ self.check(msg, """
<message type="error"> <message type="error">
<error type="cancel"> <error type="wait" code="500">
<resource-constraint xmlns="urn:ietf:params:xml:ns:xmpp-stanzas" /> <resource-constraint xmlns="urn:ietf:params:xml:ns:xmpp-stanzas" />
</error> </error>
</message> </message>
@ -50,7 +50,7 @@ class TestErrorStanzas(SleekTest):
self.check(msg, """ self.check(msg, """
<message type="error"> <message type="error">
<error type="cancel"> <error type="wait" code="500">
<text xmlns="urn:ietf:params:xml:ns:xmpp-stanzas">Error!</text> <text xmlns="urn:ietf:params:xml:ns:xmpp-stanzas">Error!</text>
</error> </error>
</message> </message>
@ -66,7 +66,7 @@ class TestErrorStanzas(SleekTest):
self.check(msg, """ self.check(msg, """
<message type="error"> <message type="error">
<error type="cancel"> <error type="wait" code="500">
<internal-server-error xmlns="urn:ietf:params:xml:ns:xmpp-stanzas" /> <internal-server-error xmlns="urn:ietf:params:xml:ns:xmpp-stanzas" />
</error> </error>
</message> </message>