diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-05-20 21:41:44 -0400 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-05-20 21:41:44 -0400 |
| commit | 9851a2a057aeee54300f703a39507713e7ad199a (patch) | |
| tree | 76056226ae21cef996b24da69534abfa08249d29 /sleekxmpp/test | |
| parent | a269be485f2918b332c9fa3717541fc0c6c954c2 (diff) | |
| parent | 7152d93dd05346fdb7dbe1893bff6395f83a79a9 (diff) | |
| download | slixmpp-9851a2a057aeee54300f703a39507713e7ad199a.tar.gz slixmpp-9851a2a057aeee54300f703a39507713e7ad199a.tar.bz2 slixmpp-9851a2a057aeee54300f703a39507713e7ad199a.tar.xz slixmpp-9851a2a057aeee54300f703a39507713e7ad199a.zip | |
Merge branch 'develop' into stream_features
Diffstat (limited to 'sleekxmpp/test')
| -rw-r--r-- | sleekxmpp/test/sleektest.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sleekxmpp/test/sleektest.py b/sleekxmpp/test/sleektest.py index fd47a87e..24af1e7a 100644 --- a/sleekxmpp/test/sleektest.py +++ b/sleekxmpp/test/sleektest.py @@ -16,7 +16,8 @@ import sleekxmpp from sleekxmpp import ClientXMPP, ComponentXMPP from sleekxmpp.stanza import Message, Iq, Presence from sleekxmpp.test import TestSocket, TestLiveSocket -from sleekxmpp.xmlstream import StanzaBase, ET, register_stanza_plugin +from sleekxmpp.xmlstream import ET, register_stanza_plugin +from sleekxmpp.xmlstream import ElementBase, StanzaBase from sleekxmpp.xmlstream.tostring import tostring from sleekxmpp.xmlstream.matcher import StanzaPath, MatcherId from sleekxmpp.xmlstream.matcher import MatchXMLMask, MatchXPath @@ -201,7 +202,7 @@ class SleekTest(unittest.TestCase): "Stanza:\n%s" % str(stanza)) else: stanza_class = stanza.__class__ - if isinstance(criteria, str): + if not isinstance(criteria, ElementBase): xml = self.parse_xml(criteria) else: xml = criteria.xml @@ -606,7 +607,7 @@ class SleekTest(unittest.TestCase): 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') |