diff options
| author | Kenneth Anthony Giusti <kgiusti@apache.org> | 2011-02-21 20:28:35 +0000 |
|---|---|---|
| committer | Kenneth Anthony Giusti <kgiusti@apache.org> | 2011-02-21 20:28:35 +0000 |
| commit | 75fe11d8c3227038796332bcd035029649b02dcf (patch) | |
| tree | 8c5505d59dde1fdf4974b65ee9ca904856e52c02 | |
| parent | 85503e9d432236661b9deff68f319b6d7c89a9a3 (diff) | |
| download | qpid-python-75fe11d8c3227038796332bcd035029649b02dcf.tar.gz | |
QPID-2935: fix the flow limit tests to run on python versions 2.4+
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1073134 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/cpp/src/tests/queue_flow_limit_tests.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/qpid/cpp/src/tests/queue_flow_limit_tests.py b/qpid/cpp/src/tests/queue_flow_limit_tests.py index f12fdcaef8..ac62dcdd1e 100644 --- a/qpid/cpp/src/tests/queue_flow_limit_tests.py +++ b/qpid/cpp/src/tests/queue_flow_limit_tests.py @@ -31,7 +31,7 @@ class QueueFlowLimitTests(TestBase010): def __getattr__(self, name): if name == "assertGreater": - return lambda a, b: self.assertTrue(a > b) + return lambda a, b: self.failUnless(a > b) else: raise AttributeError @@ -65,7 +65,7 @@ class QueueFlowLimitTests(TestBase010): self.assertEqual(i.arguments.get("qpid.flow_stop_size"), stop_size) if (resume_size is not None): self.assertEqual(i.arguments.get("qpid.flow_resume_size"), resume_size) - self.assertFalse(i.flowStopped) + self.failIf(i.flowStopped) return i.getObjectId() self.fail("Unable to create queue '%s'" % name) return None @@ -93,7 +93,7 @@ class QueueFlowLimitTests(TestBase010): Note well: prints one line of text to stdout for each consumed msg. """ command = "qpid-receive" + \ - " -b" + "%s:%s" % (self.broker.host, self.broker.port) \ + " -b " + "%s:%s" % (self.broker.host, self.broker.port) \ + " -a " + str(queue) \ + " --messages " + str(count) \ + " --timeout " + str(timeout) \ @@ -124,7 +124,7 @@ class QueueFlowLimitTests(TestBase010): self.assertEqual(i.arguments.get("qpid.flow_resume_count"), 55) self.assertEqual(i.arguments.get("qpid.flow_stop_size"), 5000000) self.assertEqual(i.arguments.get("qpid.flow_resume_size"), 100000) - self.assertFalse(i.flowStopped) + self.failIf(i.flowStopped) break; self.assertEqual(i.name, "test01") self._delete_queue("test01") @@ -150,7 +150,7 @@ class QueueFlowLimitTests(TestBase010): count < 10: sleep(1); count += 1; - self.assertTrue(self.qmf.getObjects(_objectId=oid)[0].flowStopped) + self.failUnless(self.qmf.getObjects(_objectId=oid)[0].flowStopped) depth = self.qmf.getObjects(_objectId=oid)[0].msgDepth self.assertGreater(depth, 373) @@ -179,7 +179,7 @@ class QueueFlowLimitTests(TestBase010): rcvr.close(); self.assertEqual(count, totalMsgs) - self.assertFalse(self.qmf.getObjects(_objectId=oid)[0].flowStopped) + self.failIf(self.qmf.getObjects(_objectId=oid)[0].flowStopped) self._delete_queue("test-q") @@ -204,7 +204,7 @@ class QueueFlowLimitTests(TestBase010): count < 10: sleep(1); count += 1; - self.assertTrue(self.qmf.getObjects(_objectId=oid)[0].flowStopped) + self.failUnless(self.qmf.getObjects(_objectId=oid)[0].flowStopped) self.assertGreater(self.qmf.getObjects(_objectId=oid)[0].byteDepth, 351133) # now wait until the enqueues stop happening - ensure that @@ -233,7 +233,7 @@ class QueueFlowLimitTests(TestBase010): rcvr.close(); self.assertEqual(count, totalMsgs) - self.assertFalse(self.qmf.getObjects(_objectId=oid)[0].flowStopped) + self.failIf(self.qmf.getObjects(_objectId=oid)[0].flowStopped) self._delete_queue("test-q") |