summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2012-04-18 14:16:55 +0000
committerAlan Conway <aconway@apache.org>2012-04-18 14:16:55 +0000
commit5cd161cf2311d743aee1d3b0c724064043080e38 (patch)
tree38a9401f5f860949e9ba832d3adbf18165fe5150
parentedd6a852ef6d04821e034af27e6c5ddc0e92bbfd (diff)
downloadqpid-python-5cd161cf2311d743aee1d3b0c724064043080e38.tar.gz
NO-JIRA: Fix assertion messages in brokertest.py
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1327518 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/cpp/src/tests/brokertest.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/qpid/cpp/src/tests/brokertest.py b/qpid/cpp/src/tests/brokertest.py
index 1c73e20cbb..8255fbe9ac 100644
--- a/qpid/cpp/src/tests/brokertest.py
+++ b/qpid/cpp/src/tests/brokertest.py
@@ -455,7 +455,7 @@ def assert_browse(session, queue, expect_contents, timeout=0, transform=lambda m
expect_contents"""
actual_contents = browse(session, queue, timeout, transform=transform)
if msg: msg = "%s: %r != %r"%(msg, expect_contents, actual_contents)
- assert expect_contents == actual_contents, "%s: %s != %s"%(msg, expect, actual)
+ assert expect_contents == actual_contents, msg
def assert_browse_retry(session, queue, expect_contents, timeout=1, delay=.01, transform=lambda m:m.content, msg="browse failed"):
"""Wait up to timeout for contents of queue to match expect_contents"""
@@ -463,7 +463,7 @@ def assert_browse_retry(session, queue, expect_contents, timeout=1, delay=.01, t
retry(test, timeout, delay)
actual_contents = browse(session, queue, 0, transform=transform)
if msg: msg = "%s: %r != %r"%(msg, expect_contents, actual_contents)
- assert expect_contents == actual_contents, "%s: %s != %s"%(msg, expect, actual)
+ assert expect_contents == actual_contents, msg
class BrokerTest(TestCase):
"""