QPID-4559 - Added handling of the queue-delete preconditions in the qmf broker method.

Patch contributed by Ernie Allen.


git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1456081 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 38 insertions, 1 deletions

diff --git a/qpid/cpp/src/tests/cli_tests.py b/qpid/cpp/src/tests/cli_tests.py
index 7ac5b1deed..dceafc5427 100755
--- a/qpid/cpp/src/tests/cli_tests.py
+++ b/qpid/cpp/src/tests/cli_tests.py
@@ -135,6 +135,44 @@ class CliTests(TestBase010):
                 found = True
         self.assertEqual(found, False)
 
+    def test_qpid_config_del_nonempty_queue(self):
+        self.startBrokerAccess();
+        qname = "test_qpid_config_del"
+
+        ret = os.system(self.qpid_config_command(" add queue " + qname))
+        self.assertEqual(ret, 0)
+        queues = self.broker_access.getAllQueues()
+        found = False
+        for queue in queues:
+            if queue.name == qname:
+                self.assertEqual(queue.durable, False)
+                found = True
+        self.assertEqual(found, True)
+
+        self.startBrokerAccess()
+
+        sess = self.broker_conn.session()
+        tx = sess.sender(qname)
+        tx.send("MESSAGE")
+
+        ret = os.system(self.qpid_config_command(" del queue " + qname))
+        queues = self.broker_access.getAllQueues()
+        found = False
+        for queue in queues:
+            if queue.name == qname:
+                found = True
+        self.assertEqual(found, True)
+
+        ret = os.system(self.qpid_config_command(" del queue " + qname + " --force"))
+        self.assertEqual(ret, 0)
+        queues = self.broker_access.getAllQueues()
+        found = False
+        for queue in queues:
+            if queue.name == qname:
+                found = True
+        self.assertEqual(found, False)
+
+
     def test_qpid_config_api(self):
         self.startBrokerAccess();
         qname = "test_qpid_config_api"
@@ -222,7 +260,6 @@ class CliTests(TestBase010):
         self.assertEqual(ret, 0)
         self.helper_find_queue(qname, False)
 
-
         # test the bind-queue-to-header-exchange functionality
     def test_qpid_config_headers(self):
         self.startBrokerAccess();