Repository: qpid-dispatch Updated Branches: refs/heads/master c6c03937a -> 1ce29a414
DISPATCH-179 - Removed test_02_multicast because it is the same as test_10_semantics_multicast. Also removed test_00_discard Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/1ce29a41 Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/1ce29a41 Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/1ce29a41 Branch: refs/heads/master Commit: 1ce29a41433db3af8d6dead7bd494594663b3f0d Parents: c6c0393 Author: Ganesh Murthy <gmur...@redhat.com> Authored: Mon Mar 28 15:31:19 2016 -0400 Committer: Ganesh Murthy <gmur...@redhat.com> Committed: Mon Mar 28 15:31:19 2016 -0400 ---------------------------------------------------------------------- tests/system_tests_one_router.py | 60 --------------------------------- tests/system_tests_two_routers.py | 61 ---------------------------------- 2 files changed, 121 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/1ce29a41/tests/system_tests_one_router.py ---------------------------------------------------------------------- diff --git a/tests/system_tests_one_router.py b/tests/system_tests_one_router.py index 79a79ef..19607d0 100644 --- a/tests/system_tests_one_router.py +++ b/tests/system_tests_one_router.py @@ -62,20 +62,6 @@ class RouterTest(TestCase): cls.router.wait_ready() cls.address = cls.router.addresses[0] - - def test_00_discard(self): - addr = self.address+"/discard/1" - M1 = self.messenger() - M1.start() - tm = Message() - tm.address = addr - for i in range(100): - tm.body = {'number': i} - M1.put(tm) - M1.send() - M1.stop() - - def test_01_pre_settled(self): addr = self.address+"/pre_settled/1" M1 = self.messenger() @@ -102,52 +88,6 @@ class RouterTest(TestCase): M1.stop() M2.stop() - - def test_02_multicast(self): - addr = self.address+"/pre_settled/multicast/1" - M1 = self.messenger() - M2 = self.messenger() - M3 = self.messenger() - M4 = self.messenger() - - - M1.start() - M2.start() - M3.start() - M4.start() - - M2.subscribe(addr) - M3.subscribe(addr) - M4.subscribe(addr) - - tm = Message() - rm = Message() - - tm.address = addr - for i in range(100): - tm.body = {'number': i} - M1.put(tm) - M1.send() - - for i in range(100): - M2.recv(1) - M2.get(rm) - self.assertEqual(i, rm.body['number']) - - M3.recv(1) - M3.get(rm) - self.assertEqual(i, rm.body['number']) - - M4.recv(1) - M4.get(rm) - self.assertEqual(i, rm.body['number']) - - M1.stop() - M2.stop() - M3.stop() - M4.stop() - - def test_02a_multicast_unsettled(self): addr = self.address+"/pre_settled/multicast/1" M1 = self.messenger() http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/1ce29a41/tests/system_tests_two_routers.py ---------------------------------------------------------------------- diff --git a/tests/system_tests_two_routers.py b/tests/system_tests_two_routers.py index 5605f45..2449a5c 100644 --- a/tests/system_tests_two_routers.py +++ b/tests/system_tests_two_routers.py @@ -77,17 +77,6 @@ class RouterTest(TestCase): cls.routers[0].wait_router_connected('QDR.B') cls.routers[1].wait_router_connected('QDR.A') - - def test_00_discard(self): - addr = self.routers[0].addresses[0]+"/discard/1" - M1 = self.messenger() - tm = Message() - tm.address = addr - for i in range(100): - tm.body = {'number': i} - M1.put(tm) - M1.send() - def test_01_pre_settled(self): addr = "amqp:/pre_settled/1" M1 = self.messenger() @@ -117,56 +106,6 @@ class RouterTest(TestCase): M1.stop() M2.stop() - - def test_02_multicast(self): - addr = "amqp:/pre_settled/multicast/1" - M1 = self.messenger() - M2 = self.messenger() - M3 = self.messenger() - M4 = self.messenger() - - M1.route("amqp:/*", self.routers[0].addresses[0]+"/$1") - M2.route("amqp:/*", self.routers[1].addresses[0]+"/$1") - M3.route("amqp:/*", self.routers[0].addresses[0]+"/$1") - M4.route("amqp:/*", self.routers[1].addresses[0]+"/$1") - - M1.start() - M2.start() - M3.start() - M4.start() - M2.subscribe(addr) - M3.subscribe(addr) - M4.subscribe(addr) - self.routers[0].wait_address("pre_settled/multicast/1", 1, 1) - - tm = Message() - rm = Message() - - tm.address = addr - for i in range(100): - tm.body = {'number': i} - M1.put(tm) - M1.send() - - for i in range(100): - M2.recv(1) - M2.get(rm) - self.assertEqual(i, rm.body['number']) - - M3.recv(1) - M3.get(rm) - self.assertEqual(i, rm.body['number']) - - M4.recv(1) - M4.get(rm) - self.assertEqual(i, rm.body['number']) - - M1.stop() - M2.stop() - M3.stop() - M4.stop() - - def test_02a_multicast_unsettled(self): addr = "amqp:/pre_settled/multicast/2" M1 = self.messenger() --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
