Merge branch 'develop' of github.com:fritzy/SleekXMPP into develop

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)
 

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)