summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-02-02 09:13:22 -0500
committerLance Stout <lancestout@gmail.com>2011-02-02 09:13:22 -0500
commitde6170a13de2dbb3cbcfbf4a74b749f20b0cf061 (patch)
treeb60043234119a3d215e0eca65913dd038167b551 /tests
parent65931bb384aada922c5287a3ad3cc62d04d6e676 (diff)
parent8dbe6f65462ec9b1a0506a00316415996f4d53d8 (diff)
downloadslixmpp-de6170a13de2dbb3cbcfbf4a74b749f20b0cf061.tar.gz
slixmpp-de6170a13de2dbb3cbcfbf4a74b749f20b0cf061.tar.bz2
slixmpp-de6170a13de2dbb3cbcfbf4a74b749f20b0cf061.tar.xz
slixmpp-de6170a13de2dbb3cbcfbf4a74b749f20b0cf061.zip
Merge branch 'develop' into roster
Conflicts: sleekxmpp/basexmpp.py
Diffstat (limited to 'tests')
-rw-r--r--tests/test_stanza_message.py2
-rw-r--r--tests/test_stanza_presence.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/test_stanza_message.py b/tests/test_stanza_message.py
index f06b0253..e55971df 100644
--- a/tests/test_stanza_message.py
+++ b/tests/test_stanza_message.py
@@ -49,7 +49,7 @@ class TestMessageStanzas(SleekTest):
msg['nick']['nick'] = 'A nickname!'
self.check(msg, """
<message>
- <nick xmlns="http://jabber.org/nick/nick">A nickname!</nick>
+ <nick xmlns="http://jabber.org/protocol/nick">A nickname!</nick>
</message>
""")
diff --git a/tests/test_stanza_presence.py b/tests/test_stanza_presence.py
index b8600b6a..2ec43b65 100644
--- a/tests/test_stanza_presence.py
+++ b/tests/test_stanza_presence.py
@@ -59,7 +59,7 @@ class TestPresenceStanzas(SleekTest):
p['nick']['nick'] = 'A nickname!'
self.check(p, """
<presence>
- <nick xmlns="http://jabber.org/nick/nick">A nickname!</nick>
+ <nick xmlns="http://jabber.org/protocol/nick">A nickname!</nick>
</presence>
""")