diff options
Diffstat (limited to 'python/qpid/tests/messaging')
| -rw-r--r-- | python/qpid/tests/messaging/__init__.py | 4 | ||||
| -rw-r--r-- | python/qpid/tests/messaging/endpoints.py | 44 |
2 files changed, 25 insertions, 23 deletions
diff --git a/python/qpid/tests/messaging/__init__.py b/python/qpid/tests/messaging/__init__.py index 42e88dfd72..147dbb8de5 100644 --- a/python/qpid/tests/messaging/__init__.py +++ b/python/qpid/tests/messaging/__init__.py @@ -124,8 +124,8 @@ class Base(Test): contents = self.drain(rcv) assert len(contents) == 0, "%s is supposed to be empty: %s" % (rcv, contents) - def assertPending(self, rcv, expected): - p = rcv.pending() + def assertAvailable(self, rcv, expected): + p = rcv.available() assert p == expected, "expected %s, got %s" % (expected, p) def sleep(self): diff --git a/python/qpid/tests/messaging/endpoints.py b/python/qpid/tests/messaging/endpoints.py index 320f88aa3b..c46a3f6fa9 100644 --- a/python/qpid/tests/messaging/endpoints.py +++ b/python/qpid/tests/messaging/endpoints.py @@ -271,7 +271,7 @@ class SessionTests(Base): while True: rcv = self.ssn.next_receiver(timeout=self.delay()) assert rcv in (rcv1, rcv2, rcv3) - assert rcv.pending() > 0 + assert rcv.available() > 0 fetched.append(rcv.fetch().content) except Empty: pass @@ -540,20 +540,20 @@ class ReceiverTests(Base): def testCapacityIncrease(self): content = self.send("testCapacityIncrease") self.sleep() - assert self.rcv.pending() == 0 + assert self.rcv.available() == 0 self.rcv.capacity = UNLIMITED self.sleep() - assert self.rcv.pending() == 1 + assert self.rcv.available() == 1 msg = self.rcv.fetch(0) assert msg.content == content - assert self.rcv.pending() == 0 + assert self.rcv.available() == 0 self.ssn.acknowledge() def testCapacityDecrease(self): self.rcv.capacity = UNLIMITED one = self.send("testCapacityDecrease", 1) self.sleep() - assert self.rcv.pending() == 1 + assert self.rcv.available() == 1 msg = self.rcv.fetch(0) assert msg.content == one @@ -561,7 +561,7 @@ class ReceiverTests(Base): two = self.send("testCapacityDecrease", 2) self.sleep() - assert self.rcv.pending() == 0 + assert self.rcv.available() == 0 msg = self.rcv.fetch(0) assert msg.content == two @@ -569,56 +569,56 @@ class ReceiverTests(Base): def testCapacity(self): self.rcv.capacity = 5 - self.assertPending(self.rcv, 0) + self.assertAvailable(self.rcv, 0) for i in range(15): self.send("testCapacity", i) self.sleep() - self.assertPending(self.rcv, 5) + self.assertAvailable(self.rcv, 5) self.drain(self.rcv, limit = 5) self.sleep() - self.assertPending(self.rcv, 5) + self.assertAvailable(self.rcv, 5) drained = self.drain(self.rcv) assert len(drained) == 10, "%s, %s" % (len(drained), drained) - self.assertPending(self.rcv, 0) + self.assertAvailable(self.rcv, 0) self.ssn.acknowledge() def testCapacityUNLIMITED(self): self.rcv.capacity = UNLIMITED - self.assertPending(self.rcv, 0) + self.assertAvailable(self.rcv, 0) for i in range(10): self.send("testCapacityUNLIMITED", i) self.sleep() - self.assertPending(self.rcv, 10) + self.assertAvailable(self.rcv, 10) self.drain(self.rcv) - self.assertPending(self.rcv, 0) + self.assertAvailable(self.rcv, 0) self.ssn.acknowledge() - def testPending(self): + def testAvailable(self): self.rcv.capacity = UNLIMITED - assert self.rcv.pending() == 0 + assert self.rcv.available() == 0 for i in range(3): - self.send("testPending", i) + self.send("testAvailable", i) self.sleep() - assert self.rcv.pending() == 3 + assert self.rcv.available() == 3 for i in range(3, 10): - self.send("testPending", i) + self.send("testAvailable", i) self.sleep() - assert self.rcv.pending() == 10 + assert self.rcv.available() == 10 self.drain(self.rcv, limit=3) - assert self.rcv.pending() == 7 + assert self.rcv.available() == 7 self.drain(self.rcv) - assert self.rcv.pending() == 0 + assert self.rcv.available() == 0 self.ssn.acknowledge() @@ -662,6 +662,8 @@ class ReceiverTests(Base): self.assertEmpty(rb2) self.drain(self.rcv, expected=[]) + # XXX: need testUnsettled() + class AddressTests(Base): def setup_connection(self): |