summaryrefslogtreecommitdiff
path: root/qpid
diff options
context:
space:
mode:
authorRobert Godfrey <rgodfrey@apache.org>2012-02-20 22:08:34 +0000
committerRobert Godfrey <rgodfrey@apache.org>2012-02-20 22:08:34 +0000
commitf15b75547f4bf6e61b94a109ff63253be1435a61 (patch)
treef7869118924f9ded1afcce7a2390379bd0b733e5 /qpid
parente4c32b29cf2d41c9446a5dd6a3a23a3737cbada2 (diff)
downloadqpid-python-f15b75547f4bf6e61b94a109ff63253be1435a61.tar.gz
QPID-3589 : Python tests fails against Java broker due to difference in exception message text from CPP broker
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1291482 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid')
-rw-r--r--qpid/java/test-profiles/python_tests/Java010PythonExcludes3
-rw-r--r--qpid/python/qpid/tests/messaging/endpoints.py2
2 files changed, 1 insertions, 4 deletions
diff --git a/qpid/java/test-profiles/python_tests/Java010PythonExcludes b/qpid/java/test-profiles/python_tests/Java010PythonExcludes
index 608d79ba56..488201eb6c 100644
--- a/qpid/java/test-profiles/python_tests/Java010PythonExcludes
+++ b/qpid/java/test-profiles/python_tests/Java010PythonExcludes
@@ -51,9 +51,6 @@ qpid_tests.broker_0_10.message.MessageTests.test_ack
qpid_tests.broker_0_10.message.MessageTests.test_acquire
qpid_tests.broker_0_10.message.MessageTests.test_acquire_with_no_accept_and_credit_flow
-#QPID-3589 Difference in exception text message causes test to fail
-qpid.tests.messaging.endpoints.AddressTests.testDeleteSpecial
-
###### Java Broker defects ######
diff --git a/qpid/python/qpid/tests/messaging/endpoints.py b/qpid/python/qpid/tests/messaging/endpoints.py
index 3a4dc4517e..c3702bf5be 100644
--- a/qpid/python/qpid/tests/messaging/endpoints.py
+++ b/qpid/python/qpid/tests/messaging/endpoints.py
@@ -1038,7 +1038,7 @@ class AddressTests(Base):
snd.close()
assert False, "successfully deleted amq.topic"
except SessionError, e:
- assert "Cannot delete default exchange" in str(e)
+ assert e.code == 530
# XXX: need to figure out close after error
self.conn._remove_session(self.ssn)