diff options
| author | Gordon Sim <gsim@apache.org> | 2013-09-25 12:40:17 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2013-09-25 12:40:17 +0000 |
| commit | dbfdd7294ef4db58f811cb2433feb67d89127121 (patch) | |
| tree | 0c37c35d340b00780b551cea21e22986e80db189 /qpid/cpp/src/tests | |
| parent | 39e85864268b4b4b32f53135571a57067b47abcb (diff) | |
| download | qpid-python-dbfdd7294ef4db58f811cb2433feb67d89127121.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@1526166 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests')
| -rw-r--r-- | qpid/cpp/src/tests/assertions.py | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/qpid/cpp/src/tests/assertions.py b/qpid/cpp/src/tests/assertions.py index 6a7b4a82ef..b1a06aea83 100644 --- a/qpid/cpp/src/tests/assertions.py +++ b/qpid/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 |