summaryrefslogtreecommitdiff
path: root/qpid/extras/dispatch
diff options
context:
space:
mode:
authorTed Ross <tross@apache.org>2013-09-06 14:49:00 +0000
committerTed Ross <tross@apache.org>2013-09-06 14:49:00 +0000
commitf7ba40ecda5f3518e907cd4a8f03861dc6a5c139 (patch)
tree28c8e1acf68ff92942a70815f1bea93184214a6e /qpid/extras/dispatch
parent144853a664f41feec838deda0717c94178b0244f (diff)
downloadqpid-python-f7ba40ecda5f3518e907cd4a8f03861dc6a5c139.tar.gz
NO-JIRA - Added a new test for tracked-and-undeliverable messages.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1520587 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/extras/dispatch')
-rw-r--r--qpid/extras/dispatch/tests/system_tests_one_router.py27
1 files changed, 23 insertions, 4 deletions
diff --git a/qpid/extras/dispatch/tests/system_tests_one_router.py b/qpid/extras/dispatch/tests/system_tests_one_router.py
index a952195785..b25568d283 100644
--- a/qpid/extras/dispatch/tests/system_tests_one_router.py
+++ b/qpid/extras/dispatch/tests/system_tests_one_router.py
@@ -45,6 +45,7 @@ class RouterTest(unittest.TestCase):
messenger.subscribe(address)
self.flush(messenger)
+
def test_0_discard(self):
addr = "amqp://0.0.0.0:20000/discard/1"
M1 = Messenger()
@@ -58,6 +59,7 @@ class RouterTest(unittest.TestCase):
M1.send()
M1.stop()
+
def test_1_pre_settled(self):
addr = "amqp://0.0.0.0:20000/pre_settled/1"
M1 = Messenger()
@@ -196,8 +198,25 @@ class RouterTest(unittest.TestCase):
M2.stop()
-# def test_4_unsettled_undeliverable(self):
-# pass
+ def test_4_unsettled_undeliverable(self):
+ addr = "amqp://0.0.0.0:20000/unsettled_undeliverable/1"
+ M1 = Messenger()
+
+ M1.timeout = 1.0
+ M1.outgoing_window = 5
+
+ M1.start()
+ tm = Message()
+ tm.address = addr
+ tm.body = {'number': 200}
+
+ tx_tracker = M1.put(tm)
+ M1.send(0)
+ self.flush(M1)
+ self.assertEqual(PENDING, M1.status(tx_tracker)) ## Is this right???
+
+ M1.stop()
+
def test_5_three_ack(self):
addr = "amqp://0.0.0.0:20000/three_ack/1"
@@ -259,8 +278,8 @@ class RouterTest(unittest.TestCase):
# pass
- def test_8_trace(self):
- addr = "amqp://0.0.0.0:20000/trace/1"
+ def test_8_delivery_annotations(self):
+ addr = "amqp://0.0.0.0:20000/da/1"
M1 = Messenger()
M2 = Messenger()