summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--qpid/tests/src/py/qpid_tests/broker_0_10/exchange.py16
1 files changed, 14 insertions, 2 deletions
diff --git a/qpid/tests/src/py/qpid_tests/broker_0_10/exchange.py b/qpid/tests/src/py/qpid_tests/broker_0_10/exchange.py
index 53de37f12c..4edefc0abb 100644
--- a/qpid/tests/src/py/qpid_tests/broker_0_10/exchange.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_10/exchange.py
@@ -96,8 +96,9 @@ class TestHelper(TestBase010):
auto_delete=False,
arguments={}):
session = session or self.session
- reply = session.exchange_declare(exchange=exchange, type=type, passive=passive,durable=durable, auto_delete=auto_delete, arguments=arguments)
- self.exchanges.append((session,exchange))
+ reply = session.exchange_declare(exchange=exchange, type=type, passive=passive, durable=durable, auto_delete=auto_delete, arguments=arguments)
+ if exchange and not exchange.startswith("amq."):
+ self.exchanges.append((session,exchange))
return reply
def uniqueString(self):
@@ -483,6 +484,17 @@ class MiscellaneousErrorsTests(TestHelper):
except SessionException, e:
self.assertEquals(530, e.args[0].error_code)
+ def testReservedExchangeRedeclaredSameType(self):
+ self.exchange_declare(exchange="amq.direct", type="direct", passive=False)
+ self.exchange_declare(exchange="amq.direct", type="direct", passive=True)
+
+ def testReservedExchangeRedeclaredDifferentType(self):
+ try:
+ self.exchange_declare(exchange="amq.direct", type="topic")
+ self.fail("Expected 530 for redeclaration of exchange with different type.")
+ except SessionException, e:
+ self.assertEquals(530, e.args[0].error_code)
+
def testDefaultAccessBind(self):
try:
self.session.queue_declare(queue="my-queue", auto_delete=True, exclusive=True)