summaryrefslogtreecommitdiff
path: root/sleekxmpp/test
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2010-11-17 16:07:27 -0500
committerLance Stout <lancestout@gmail.com>2010-11-17 16:08:14 -0500
commite648f08badce77bce3842108340a4c257b619bc1 (patch)
tree8e809f1fe997d31f4c4a6269717bdd1f6f9459b1 /sleekxmpp/test
parent7ba6d5e02daced34960a11506b4600ba096a9570 (diff)
downloadslixmpp-e648f08badce77bce3842108340a4c257b619bc1.tar.gz
slixmpp-e648f08badce77bce3842108340a4c257b619bc1.tar.bz2
slixmpp-e648f08badce77bce3842108340a4c257b619bc1.tar.xz
slixmpp-e648f08badce77bce3842108340a4c257b619bc1.zip
Fix stream test errors.
Diffstat (limited to 'sleekxmpp/test')
-rw-r--r--sleekxmpp/test/sleektest.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/sleekxmpp/test/sleektest.py b/sleekxmpp/test/sleektest.py
index 27a7556f..5e61cec2 100644
--- a/sleekxmpp/test/sleektest.py
+++ b/sleekxmpp/test/sleektest.py
@@ -197,7 +197,10 @@ class SleekTest(unittest.TestCase):
"Stanza:\n%s" % str(stanza))
else:
stanza_class = stanza.__class__
- xml = self.parse_xml(criteria)
+ if isinstance(criteria, str):
+ xml = self.parse_xml(criteria)
+ else:
+ xml = criteria.xml
# Ensure that top level namespaces are used, even if they
# were not provided.
@@ -590,7 +593,6 @@ class SleekTest(unittest.TestCase):
sent = self.xmpp.socket.next_sent(timeout)
if sent is None:
return False
- print sent
xml = self.parse_xml(sent)
self.fix_namespaces(xml, 'jabber:client')
sent = self.xmpp._build_stanza(xml, 'jabber:client')