1 files changed, 4 insertions, 54 deletions
diff --git a/qpid/tests/src/py/qpid_tests/broker_0_10/extensions.py b/qpid/tests/src/py/qpid_tests/broker_0_10/extensions.py
index 50c0aa3dd1..26ea3cb0e9 100644
--- a/qpid/tests/src/py/qpid_tests/broker_0_10/extensions.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_10/extensions.py
@@ -20,8 +20,6 @@ from qpid.client import Client, Closed
 from qpid.queue import Empty
 from qpid.content import Content
 from qpid.testlib import TestBase010
-from qpid.session import SessionException
-from qpid.datatypes import uuid4
 from time import sleep
 
 class ExtensionTests(TestBase010):
@@ -30,58 +28,10 @@ class ExtensionTests(TestBase010):
     def test_timed_autodelete(self):
         session = self.session
         session2 = self.conn.session("another-session")
-        name=str(uuid4())
-        session2.queue_declare(queue=name, exclusive=True, auto_delete=True, arguments={"qpid.auto_delete_timeout":3})
+        session2.queue_declare(queue="my-queue", exclusive=True, auto_delete=True, arguments={"qpid.auto_delete_timeout":5})
         session2.close()
-        result = session.queue_query(queue=name)
-        self.assertEqual(name, result.queue)
+        result = session.queue_query(queue="my-queue")
+        self.assertEqual("my-queue", result.queue)
         sleep(5)
-        result = session.queue_query(queue=name)
+        result = session.queue_query(queue="my-queue")
         self.assert_(not result.queue)
-
-    def valid_policy_args(self, args, name="test-queue"):
-        try:
-            self.session.queue_declare(queue=name, arguments=args)
-            self.session.queue_delete(queue=name) # cleanup
-        except SessionException, e:
-            self.fail("declare with valid policy args failed: %s" % (args))
-            self.session = self.conn.session("replacement", 2)
-
-    def invalid_policy_args(self, args, name="test-queue"):
-        # go through invalid declare attempts twice to make sure that
-        # the queue doesn't actually get created first time around
-        # even if exception is thrown
-        for i in range(1, 3):
-            try:
-                self.session.queue_declare(queue=name, arguments=args)
-                self.session.queue_delete(queue=name) # cleanup
-                self.fail("declare with invalid policy args suceeded: %s (iteration %d)" % (args, i))
-            except SessionException, e:
-                self.session = self.conn.session(str(uuid4()))
-
-    def test_policy_max_size_as_valid_string(self):
-        self.valid_policy_args({"qpid.max_size":"3"})
-
-    def test_policy_max_count_as_valid_string(self):
-        self.valid_policy_args({"qpid.max_count":"3"})
-
-    def test_policy_max_count_and_size_as_valid_strings(self):
-        self.valid_policy_args({"qpid.max_count":"3","qpid.max_size":"0"})
-
-    def test_policy_negative_count(self):
-        self.invalid_policy_args({"qpid.max_count":-1})
-
-    def test_policy_negative_size(self):
-        self.invalid_policy_args({"qpid.max_size":-1})
-
-    def test_policy_size_as_invalid_string(self):
-        self.invalid_policy_args({"qpid.max_size":"foo"})
-
-    def test_policy_count_as_invalid_string(self):
-        self.invalid_policy_args({"qpid.max_count":"foo"})
-
-    def test_policy_size_as_float(self):
-        self.invalid_policy_args({"qpid.max_size":3.14159})
-
-    def test_policy_count_as_float(self):
-        self.invalid_policy_args({"qpid.max_count":"2222222.22222"})