diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-04-26 16:33:42 -0400 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-04-26 16:33:42 -0400 |
| commit | b1439df72aedec0d96642531edfdc9e3ca8ea673 (patch) | |
| tree | 222bca89790fa8c1a735d3f30de5255b7d0ca855 | |
| parent | ea8c40c7b637d656a596e16555a0d8695932a06f (diff) | |
| parent | 5399fdd3a95377bfb5bba993f299664557cabb7c (diff) | |
| download | slixmpp-b1439df72aedec0d96642531edfdc9e3ca8ea673.tar.gz slixmpp-b1439df72aedec0d96642531edfdc9e3ca8ea673.tar.bz2 slixmpp-b1439df72aedec0d96642531edfdc9e3ca8ea673.tar.xz slixmpp-b1439df72aedec0d96642531edfdc9e3ca8ea673.zip | |
Merge branch 'develop' into stream_features
| -rw-r--r-- | sleekxmpp/plugins/stanza_pubsub.py | 2 | ||||
| -rw-r--r-- | sleekxmpp/test/sleektest.py | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/sleekxmpp/plugins/stanza_pubsub.py b/sleekxmpp/plugins/stanza_pubsub.py index 2d809a35..b5964537 100644 --- a/sleekxmpp/plugins/stanza_pubsub.py +++ b/sleekxmpp/plugins/stanza_pubsub.py @@ -237,6 +237,8 @@ class Unsubscribe(ElementBase): def getJid(self): return JID(self._getAttr('jid')) +registerStanzaPlugin(Pubsub, Unsubscribe) + class Subscribe(ElementBase): namespace = 'http://jabber.org/protocol/pubsub' name = 'subscribe' diff --git a/sleekxmpp/test/sleektest.py b/sleekxmpp/test/sleektest.py index c5f48895..fd47a87e 100644 --- a/sleekxmpp/test/sleektest.py +++ b/sleekxmpp/test/sleektest.py @@ -600,8 +600,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') |