Fix to r1028346: no point in throwing exception after queue has already been created, so just log error and revert to default (do this for floating point values also)

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

1 files changed, 0 insertions, 75 deletions

diff --git a/qpid/tests/src/py/qpid_tests/broker_0_10/queue.py b/qpid/tests/src/py/qpid_tests/broker_0_10/queue.py
index 294155ee8c..d68cf91492 100644
--- a/qpid/tests/src/py/qpid_tests/broker_0_10/queue.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_10/queue.py
@@ -115,81 +115,6 @@ class QueueTests(TestBase010):
         except SessionException, e:
             self.assertEquals(405, e.args[0].error_code)
 
-    def test_declare_capacity_valid(self):
-        session = self.session
-
-        try:
-            queue_options = {}
-            queue_options["qpid.max_count"] = 0
-            queue_options["qpid.max_size"] = 0
-            session.queue_declare(queue="queue_capacity1", exclusive=True, arguments=queue_options)
-        except SessionException, e:
-            self.fail("Should accept queue create request with name=queue_capacity1, qpid.max_count=0 and qpid.max_size=0")
-
-        try:
-            queue_options = {}
-            queue_options["qpid.max_count"] = 3
-            queue_options["qpid.max_size"] = 0
-            session.queue_declare(queue="queue_capacity2", exclusive=True, arguments=queue_options)
-        except SessionException, e:
-            self.fail("Should accept queue create request with name=queue_capacity2, qpid.max_count=3 and qpid.max_size=0")
-
-        try:
-            queue_options = {}
-            queue_options["qpid.max_count"] = 0
-            queue_options["qpid.max_size"] = 300
-            session.queue_declare(queue="queue_capacity3", exclusive=True, arguments=queue_options)
-        except SessionException, e:
-            self.fail("Should accept queue create request with name=queue_capacity3, qpid.max_count=0 and qpid.max_size=300")
-
-        try:
-            queue_options = {}
-            queue_options["qpid.max_count"] = 0
-            queue_options["qpid.max_size"] = "3"
-            session.queue_declare(queue="queue_capacity6", exclusive=True, arguments=queue_options)
-        except SessionException, e:
-            self.fail("Should allow queue create request with qpid.max_size='3'")
-
-
-    def test_declare_capacity_invalid(self):
-        session = self.session
-        try:
-            queue_options = {}
-            queue_options["qpid.max_count"] = -1
-            queue_options["qpid.max_size"] = 0
-            session.queue_declare(queue="queue_capacity4", exclusive=True, arguments=queue_options)
-            self.fail("Should reject queue create request with name=queue_capacity4, qpid.max_count=-1 and qpid.max_size=0")
-        except SessionException, e:
-            pass
-
-        try:
-            queue_options = {}
-            queue_options["qpid.max_count"] = 0
-            queue_options["qpid.max_size"] = -1
-            session.queue_declare(queue="queue_capacity5", exclusive=True, arguments=queue_options)
-            self.fail("Should reject queue create request with name=queue_capacity5, qpid.max_count=0 and qpid.max_size=-1")
-        except SessionException, e:
-            pass
-
-        try:
-            queue_options = {}
-            queue_options["qpid.max_count"] = 0
-            queue_options["qpid.max_size"] = "flummery"
-            session.queue_declare(queue="queue_capacity7", exclusive=True, arguments=queue_options)
-            self.fail("Should deny queue create request with name=queue_capacity7, qpid.max_count=0 and qpid.max_size='flummery'")
-        except SessionException, e:
-            pass
-
-        try:
-            queue_options = {}
-            queue_options["qpid.max_count"] = 0
-            queue_options["qpid.max_size"] = 3.14159
-            session.queue_declare(queue="queue_capacity8", exclusive=True, arguments=queue_options)
-            self.fail("Should deny queue create request with name=queue_capacity4, qpid.max_count=0 and qpid.max_size=3.14159");
-        except SessionException, e:
-            pass
-
-
     def test_declare_passive(self):
         """
         Test that the passive field is honoured in queue.declare