You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gm...@apache.org on 2018/03/27 17:54:13 UTC
qpid-dispatch git commit: DISPATCH-947 - Removed a useless test. This
test is a duplicate of an already existing test and was not doing much. Also
modified test_09_to_override to not use messenger
Repository: qpid-dispatch
Updated Branches:
refs/heads/master 165907723 -> 0f42beca4
DISPATCH-947 - Removed a useless test. This test is a duplicate of an already existing test and was not doing much. Also modified test_09_to_override to not use messenger
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/0f42beca
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/0f42beca
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/0f42beca
Branch: refs/heads/master
Commit: 0f42beca47572fbe453052dea6459b450ecafb1c
Parents: 1659077
Author: Ganesh Murthy <gm...@redhat.com>
Authored: Tue Mar 27 13:53:57 2018 -0400
Committer: Ganesh Murthy <gm...@redhat.com>
Committed: Tue Mar 27 13:53:57 2018 -0400
----------------------------------------------------------------------
tests/system_tests_two_routers.py | 118 ++++++++++++++-------------------
1 file changed, 48 insertions(+), 70 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/0f42beca/tests/system_tests_two_routers.py
----------------------------------------------------------------------
diff --git a/tests/system_tests_two_routers.py b/tests/system_tests_two_routers.py
index 0d64c8c..2854c72 100644
--- a/tests/system_tests_two_routers.py
+++ b/tests/system_tests_two_routers.py
@@ -142,7 +142,7 @@ class TwoRouterTest(TestCase):
self.assertEqual(None, test.error)
def test_03a_test_strip_message_annotations_in(self):
- test = MessageAnnotationSstripMessageAnnotationsInn(self.routers[0].addresses[4], self.routers[1].addresses[4])
+ test = MessageAnnotationStripMessageAnnotationsIn(self.routers[0].addresses[4], self.routers[1].addresses[4])
test.run()
self.assertEqual(None, test.error)
@@ -167,43 +167,10 @@ class TwoRouterTest(TestCase):
test.run()
self.assertEqual(None, test.error)
- def test_9_to_override(self):
- addr = "amqp:/toov/1"
- M1 = self.messenger()
- M2 = self.messenger()
-
- M1.route("amqp:/*", self.routers[0].addresses[0]+"/$1")
- M2.route("amqp:/*", self.routers[1].addresses[0]+"/$1")
-
- M1.start()
- M2.start()
- M2.subscribe(addr)
- self.routers[0].wait_address("toov/1", 0, 1)
-
- tm = Message()
- rm = Message()
-
- tm.address = addr
-
- ##
- ## Pre-existing TO
- ##
- tm.annotations = {'x-opt-qd.to': 'toov/1'}
- for i in range(10):
- tm.body = {'number': i}
- M1.put(tm)
- M1.send()
-
- for i in range(10):
- M2.recv(1)
- M2.get(rm)
- self.assertEqual(i, rm.body['number'])
- ma = rm.annotations
- self.assertEqual(ma.__class__, dict)
- self.assertEqual(ma['x-opt-qd.to'], 'toov/1')
-
- M1.stop()
- M2.stop()
+ def test_09_to_override(self):
+ test = MessageAnnotaionsPreExistingOverride(self.routers[0].addresses[0], self.routers[1].addresses[0])
+ test.run()
+ self.assertEqual(None, test.error)
def test_10_propagated_disposition(self):
addr = "amqp:/unsettled/2"
@@ -334,36 +301,6 @@ class TwoRouterTest(TestCase):
test.run()
self.assertEqual(None, test.error)
- def test_16_delivery_annotations(self):
- addr = "amqp:/delivery_annotations.1"
- M1 = self.messenger()
- M2 = self.messenger()
-
- M1.route("amqp:/*", self.routers[0].addresses[0]+"/$1")
- M2.route("amqp:/*", self.routers[1].addresses[0]+"/$1")
- M1.start()
- M2.start()
- M2.subscribe(addr)
-
- tm = Message()
- rm = Message()
-
- self.routers[0].wait_address("delivery_annotations.1", 0, 1)
-
- tm.annotations = {'a1': 'a1', 'b1': 'b2'}
- tm.address = addr
- tm.instructions = {'work': 'hard', 'stay': 'humble'}
- tm.body = {'number': 38}
- M1.put(tm)
- M1.send()
-
- M2.recv(1)
- M2.get(rm)
- self.assertEqual(38, rm.body['number'])
-
- M1.stop()
- M2.stop()
-
def test_17_address_wildcard(self):
# verify proper distribution is selected by wildcard
addresses = [
@@ -786,9 +723,9 @@ class ManagementTest(MessagingHandler):
Container(self).run()
-class MessageAnnotationSstripMessageAnnotationsInn(MessagingHandler):
+class MessageAnnotationStripMessageAnnotationsIn(MessagingHandler):
def __init__(self, address1, address2):
- super(MessageAnnotationSstripMessageAnnotationsInn, self).__init__()
+ super(MessageAnnotationStripMessageAnnotationsIn, self).__init__()
self.address1 = address1
self.address2 = address2
self.dest = "strip_message_annotations_in/1"
@@ -832,6 +769,47 @@ class MessageAnnotationSstripMessageAnnotationsInn(MessagingHandler):
Container(self).run()
+class MessageAnnotaionsPreExistingOverride(MessagingHandler):
+ def __init__(self, address1, address2):
+ super(MessageAnnotaionsPreExistingOverride, self).__init__()
+ self.address1 = address1
+ self.address2 = address2
+ self.dest = "toov/1"
+ self.error = "Pre-existing x-opt-qd.to has been stripped"
+ self.timer = None
+ self.conn1 = None
+ self.conn2 = None
+ self.sender = None
+ self.receiver = None
+ self.msg_not_sent = True
+
+ def on_start(self, event):
+ self.timer = event.reactor.schedule(TIMEOUT, Timeout(self))
+ self.conn1 = event.container.connect(self.address1)
+ self.sender = event.container.create_sender(self.conn1, self.dest)
+ self.conn2 = event.container.connect(self.address2)
+ self.receiver = event.container.create_receiver(self.conn2, self.dest)
+
+ def on_sendable(self, event):
+ if self.msg_not_sent:
+ msg = Message(body={'number': 0})
+ msg.annotations = {'x-opt-qd.to': 'toov/1'}
+ event.sender.send(msg)
+ self.msg_not_sent = False
+
+ def on_message(self, event):
+ if 0 == event.message.body['number']:
+ ma = event.message.annotations
+ if ma['x-opt-qd.to'] == 'toov/1':
+ self.error = None
+ self.timer.cancel()
+ self.conn1.close()
+ self.conn2.close()
+
+ def run(self):
+ Container(self).run()
+
+
class MessageAnnotationsStripMessageAnnotationsOut(MessagingHandler):
def __init__(self, address1, address2):
super(MessageAnnotationsStripMessageAnnotationsOut, self).__init__()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org