summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Fritz <fritzy@netflint.net>2011-08-30 22:44:34 -0700
committerNathan Fritz <fritzy@netflint.net>2011-08-30 22:44:34 -0700
commit4699bdff6046e37d9fe4a8c1e29923e239126908 (patch)
tree16915bb496575272b1914b75a96c150165df66d5
parent354641a3ce5a295ab67ba4c8bf7169d10a835f36 (diff)
parent13fdab01398ba69de42006064358624a8742b1f5 (diff)
downloadslixmpp-4699bdff6046e37d9fe4a8c1e29923e239126908.tar.gz
slixmpp-4699bdff6046e37d9fe4a8c1e29923e239126908.tar.bz2
slixmpp-4699bdff6046e37d9fe4a8c1e29923e239126908.tar.xz
slixmpp-4699bdff6046e37d9fe4a8c1e29923e239126908.zip
Merge branch 'develop' of github.com:fritzy/SleekXMPP into develop
-rw-r--r--sleekxmpp/plugins/xep_0060/pubsub.py2
-rw-r--r--tests/test_stream_xep_0060.py22
2 files changed, 23 insertions, 1 deletions
diff --git a/sleekxmpp/plugins/xep_0060/pubsub.py b/sleekxmpp/plugins/xep_0060/pubsub.py
index 894ceffa..f9999f73 100644
--- a/sleekxmpp/plugins/xep_0060/pubsub.py
+++ b/sleekxmpp/plugins/xep_0060/pubsub.py
@@ -262,7 +262,7 @@ class xep_0060(base_plugin):
callback -- Optional reference to a stream handler function. Will
be executed when a reply stanza is received.
"""
- iq = self.xmpp.Iq(sto=jid, sfrom=ifrom, stype='get')
+ iq = self.xmpp.Iq(sto=jid, sfrom=ifrom, stype='set')
iq['pubsub_owner']['delete']['node'] = node
return iq.send(block=block, callback=callback, timeout=timeout)
diff --git a/tests/test_stream_xep_0060.py b/tests/test_stream_xep_0060.py
index cb93bbf6..1d912ca5 100644
--- a/tests/test_stream_xep_0060.py
+++ b/tests/test_stream_xep_0060.py
@@ -102,5 +102,27 @@ class TestStreamPubsub(SleekTest):
t.join()
+ def testDeleteNode(self):
+ """Test deleting a node"""
+ t = threading.Thread(name='delete_node',
+ target=self.xmpp['xep_0060'].delete_node,
+ args=('pubsub.example.com', 'some_node'))
+ t.start()
+
+ self.send("""
+ <iq type="set" to="pubsub.example.com" id="1">
+ <pubsub xmlns="http://jabber.org/protocol/pubsub#owner">
+ <delete node="some_node" />
+ </pubsub>
+ </iq>
+ """)
+
+ self.recv("""
+ <iq type="result" id="1"
+ to="tester@localhost" from="pubsub.example.com" />
+ """)
+
+ t.join()
+
suite = unittest.TestLoader().loadTestsFromTestCase(TestStreamPubsub)