summaryrefslogtreecommitdiff
path: root/cpp/src/tests/assertions.py
diff options
context:
space:
mode:
authorGordon Sim <gsim@apache.org>2013-09-25 12:40:17 +0000
committerGordon Sim <gsim@apache.org>2013-09-25 12:40:17 +0000
commit4a56d7bb6b839e1e4dd61251ee4fdf055fd4d5cd (patch)
tree309c922aab077ee74cc7688513e30403026cf31a /cpp/src/tests/assertions.py
parentde211a2a8a15f31c80d50c292960938f51fb4241 (diff)
downloadqpid-python-4a56d7bb6b839e1e4dd61251ee4fdf055fd4d5cd.tar.gz
QPID-5156: prevent tests for assert functionality with swigged client failing on RHEL5
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1526166 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests/assertions.py')
-rw-r--r--cpp/src/tests/assertions.py13
1 files changed, 13 insertions, 0 deletions
diff --git a/cpp/src/tests/assertions.py b/cpp/src/tests/assertions.py
index 6a7b4a82ef..b1a06aea83 100644
--- a/cpp/src/tests/assertions.py
+++ b/cpp/src/tests/assertions.py
@@ -32,6 +32,7 @@ class AssertionTests (VersionTest):
self.ssn.sender("%s; {assert:always, node:{properties:{alternate-exchange:amq.topic}}}" % name)
assert False, "Expected assertion to fail on alternate-exchange"
except AssertionFailed: None
+ except MessagingError: None
def test_queues_alternate_exchange2(self):
name = str(uuid4())
@@ -41,6 +42,7 @@ class AssertionTests (VersionTest):
self.ssn.sender("%s; {assert:always, node:{x-declare:{alternate-exchange:amq.topic}}}" % name)
assert False, "Expected assertion to fail on alternate-exchange"
except AssertionFailed: None
+ except MessagingError: None
def test_queue_type(self):
name = str(uuid4())
@@ -50,6 +52,7 @@ class AssertionTests (VersionTest):
self.ssn.sender("%s; {assert:always, node:{type:topic}}" % name)
assert False, "Expected assertion to fail on type"
except AssertionFailed: None
+ except MessagingError: None
def test_queue_durability(self):
name = str(uuid4())
@@ -59,6 +62,7 @@ class AssertionTests (VersionTest):
self.ssn.sender("%s; {assert:always, node:{durable:True}}" % name)
assert False, "Expected assertion to fail on durability"
except AssertionFailed: None
+ except MessagingError: None
def test_queue_options(self):
name = str(uuid4())
@@ -68,14 +72,17 @@ class AssertionTests (VersionTest):
self.ssn.sender("%s; {assert:always, node:{x-declare:{arguments:{foo:bar}}}}" % name)
assert False, "Expected assertion to fail on unrecognised option"
except AssertionFailed: None
+ except MessagingError: None
try:
self.ssn.sender("%s; {assert:always, node:{x-declare:{arguments:{'qpid.max_count':10}}}}" % name)
assert False, "Expected assertion to fail on unspecified option"
except AssertionFailed: None
+ except MessagingError: None
try:
self.ssn.sender("%s; {assert:always, node:{x-declare:{arguments:{'qpid.last_value_key':xyz}}}}" % name)
assert False, "Expected assertion to fail on option with different value"
except AssertionFailed: None
+ except MessagingError: None
def test_exchanges_alternate_exchange1(self):
name = str(uuid4())
@@ -85,6 +92,7 @@ class AssertionTests (VersionTest):
self.ssn.sender("%s; {assert:always, node:{properties:{alternate-exchange:amq.topic}}}" % name)
assert False, "Expected assertion to fail on alternate-exchange"
except AssertionFailed: None
+ except MessagingError: None
def test_exchanges_alternate_exchange2(self):
name = str(uuid4())
@@ -94,6 +102,7 @@ class AssertionTests (VersionTest):
self.ssn.sender("%s; {assert:always, node:{x-declare:{alternate-exchange:amq.topic}}}" % name)
assert False, "Expected assertion to fail on alternate-exchange"
except AssertionFailed: None
+ except MessagingError: None
def test_exchange_type(self):
name = str(uuid4())
@@ -103,6 +112,7 @@ class AssertionTests (VersionTest):
self.ssn.sender("%s; {assert:always, node:{type:queue}}" % name)
assert False, "Expected assertion to fail on type"
except AssertionFailed: None
+ except MessagingError: None
def test_exchange_durability(self):
name = str(uuid4())
@@ -112,6 +122,7 @@ class AssertionTests (VersionTest):
self.ssn.sender("%s; {assert:always, node:{durable:True}}" % name)
assert False, "Expected assertion to fail on durability"
except AssertionFailed: None
+ except MessagingError: None
def test_exchange_options(self):
name = str(uuid4())
@@ -121,8 +132,10 @@ class AssertionTests (VersionTest):
self.ssn.sender("%s; {assert:always, node:{x-declare:{arguments:{foo:bar}}}}" % name)
assert False, "Expected assertion to fail on unrecognised option"
except AssertionFailed: None
+ except MessagingError: None
try:
self.ssn.sender("%s; {assert:always, node:{x-declare:{arguments:{'qpid.ive':True}}}}" % name)
assert False, "Expected assertion to fail on unspecified option"
except AssertionFailed: None
+ except MessagingError: None