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 2016/03/28 21:59:07 UTC
qpid-dispatch git commit: DISPATCH-179 - Removed
test_08a_test_strip_message_annotations_out_timeout. The router now uses
link-exclusion set to prevent looping by dropping delivery before it loops
rather than after it has already looped
Repository: qpid-dispatch
Updated Branches:
refs/heads/master 1ce29a414 -> 04d3f75a2
DISPATCH-179 - Removed test_08a_test_strip_message_annotations_out_timeout. The router now uses link-exclusion set to prevent looping by dropping delivery before it loops rather than after it has already looped
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/04d3f75a
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/04d3f75a
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/04d3f75a
Branch: refs/heads/master
Commit: 04d3f75a22471f0f8e86583f77e4ac23eb0388eb
Parents: 1ce29a4
Author: Ganesh Murthy <gm...@redhat.com>
Authored: Mon Mar 28 15:58:50 2016 -0400
Committer: Ganesh Murthy <gm...@redhat.com>
Committed: Mon Mar 28 15:58:50 2016 -0400
----------------------------------------------------------------------
tests/system_tests_one_router.py | 36 ------------------------------
tests/system_tests_two_routers.py | 40 ----------------------------------
2 files changed, 76 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/04d3f75a/tests/system_tests_one_router.py
----------------------------------------------------------------------
diff --git a/tests/system_tests_one_router.py b/tests/system_tests_one_router.py
index 19607d0..88f0a8b 100644
--- a/tests/system_tests_one_router.py
+++ b/tests/system_tests_one_router.py
@@ -649,42 +649,6 @@ class RouterTest(TestCase):
M1.stop()
M2.stop()
-
- def test_08a_test_strip_message_annotations_out_timeout(self):
- addr = self.router.addresses[3]+"/strip_message_annotations_out_timeout/1"
-
- M1 = self.messenger()
- M2 = self.messenger()
-
- M1.start()
- M2.start()
- M2.timeout = 0.5
- M2.subscribe(addr)
-
- ingress_message = Message()
- ingress_message.address = addr
- ingress_message.body = {'message': 'Hello World!'}
-
- ingress_message_annotations = {'x-opt-qd.ingress': '0/QDR', 'x-opt-qd.trace': ['0/QDR']}
- ingress_message.annotations = ingress_message_annotations
-
- #Put and send the message
- M1.put(ingress_message)
- M1.send()
-
- timed_out = False
- try:
- # Receive the message, this should timeout because the router thinks that this message has looped.
- M2.recv(1)
- except Timeout:
- timed_out = True
-
- self.assertTrue(timed_out)
-
- M1.stop()
- M2.stop()
-
-
#Send in pre-existing trace and ingress and annotations and make sure that they are not in the outgoing annotations.
#stripAnnotations property is set to "in"
def test_08a_test_strip_message_annotations_in(self):
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/04d3f75a/tests/system_tests_two_routers.py
----------------------------------------------------------------------
diff --git a/tests/system_tests_two_routers.py b/tests/system_tests_two_routers.py
index 2449a5c..630dcb1 100644
--- a/tests/system_tests_two_routers.py
+++ b/tests/system_tests_two_routers.py
@@ -611,46 +611,6 @@ class RouterTest(TestCase):
M1.stop()
M2.stop()
-
- def test_08a_test_strip_message_annotations_out_timeout(self):
- addr = "amqp:/strip_message_annotations_out_timeout/1"
- M1 = self.messenger()
- M2 = self.messenger()
-
- M1.route("amqp:/*", self.routers[0].addresses[3]+"/$1")
- M2.route("amqp:/*", self.routers[1].addresses[3]+"/$1")
-
- M1.start()
- M2.start()
- M2.timeout = 0.5
- M2.subscribe(addr)
-
- self.routers[0].wait_address("strip_message_annotations_out_timeout/1", 0, 1)
-
- ingress_message = Message()
- ingress_message.address = addr
- ingress_message.body = {'message': 'Hello World!'}
-
- ingress_message_annotations = {'x-opt-qd.ingress': '0/QDR.A', 'x-opt-qd.trace': ['0/QDR.A']}
- ingress_message.annotations = ingress_message_annotations
-
- #Put and send the message
- M1.put(ingress_message)
- M1.send()
-
- # Receive the message, this should timeout because the router thinks that this message has looped.
- timed_out = False
- try:
- M2.recv(1)
- except Timeout:
- timed_out = True
-
- self.assertTrue(timed_out)
-
- M1.stop()
- M2.stop()
-
-
#Send in pre-existing trace and ingress and annotations and make sure that they are not in the outgoing annotations.
#stripAnnotations property is set to "in"
def test_08a_test_strip_message_annotations_in(self):
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org