summaryrefslogtreecommitdiff
path: root/sleekxmpp
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-04-26 16:33:32 -0400
committerLance Stout <lancestout@gmail.com>2011-04-26 16:33:32 -0400
commit8e46aa70543eb6cc003b69877e7677480db3a4dc (patch)
tree26d21e22fdc60e180d42c31998eea9f691fc3151 /sleekxmpp
parent8a22597180cd9ec672515218aed1abe3529d2104 (diff)
parent5399fdd3a95377bfb5bba993f299664557cabb7c (diff)
downloadslixmpp-8e46aa70543eb6cc003b69877e7677480db3a4dc.tar.gz
slixmpp-8e46aa70543eb6cc003b69877e7677480db3a4dc.tar.bz2
slixmpp-8e46aa70543eb6cc003b69877e7677480db3a4dc.tar.xz
slixmpp-8e46aa70543eb6cc003b69877e7677480db3a4dc.zip
Merge branch 'develop' into roster
Diffstat (limited to 'sleekxmpp')
-rw-r--r--sleekxmpp/test/sleektest.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/sleekxmpp/test/sleektest.py b/sleekxmpp/test/sleektest.py
index 3f4974d5..e478e3a7 100644
--- a/sleekxmpp/test/sleektest.py
+++ b/sleekxmpp/test/sleektest.py
@@ -626,8 +626,13 @@ class SleekTest(unittest.TestCase):
Defaults to the value of self.match_method.
"""
sent = self.xmpp.socket.next_sent(timeout)
+ if data is None and sent is None:
+ return
+ if data is None and sent is not None:
+ self.fail("Stanza data was sent: %s" % sent)
if sent is None:
self.fail("No stanza was sent.")
+
xml = self.parse_xml(sent)
self.fix_namespaces(xml, 'jabber:client')
sent = self.xmpp._build_stanza(xml, 'jabber:client')