Repository: qpid-dispatch Updated Branches: refs/heads/master 3938487f8 -> 42a4666f1
DISPATCH-1060 - Fixed tests that were creating internal router instances instead of using functions offered by the test framework Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/42a4666f Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/42a4666f Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/42a4666f Branch: refs/heads/master Commit: 42a4666f1579c5aa3bb020a94f90285c671e4c12 Parents: 3938487 Author: Ganesh Murthy <[email protected]> Authored: Tue Jul 10 11:54:41 2018 -0400 Committer: Ganesh Murthy <[email protected]> Committed: Tue Jul 10 11:54:41 2018 -0400 ---------------------------------------------------------------------- tests/system_tests_global_delivery_counts.py | 12 ++++++------ tests/system_tests_http.py | 5 ++--- 2 files changed, 8 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/42a4666f/tests/system_tests_global_delivery_counts.py ---------------------------------------------------------------------- diff --git a/tests/system_tests_global_delivery_counts.py b/tests/system_tests_global_delivery_counts.py index db4a868..14c38df 100644 --- a/tests/system_tests_global_delivery_counts.py +++ b/tests/system_tests_global_delivery_counts.py @@ -37,7 +37,7 @@ class OneRouterModifiedTest(TestCase): ('router', {'mode': 'standalone', 'id': 'A'}), ('listener', {'port': listen_port, 'authenticatePeer': False, 'saslMechanisms': 'ANONYMOUS'})]) - cls.router = Qdrouterd(name="A", config=config, wait=True) + cls.router = cls.tester.qdrouterd(name="A", config=config, wait=True) def test_one_router_modified_counts(self): address = self.router.addresses[0] @@ -66,7 +66,7 @@ class OneRouterRejectedTest(TestCase): ('router', {'mode': 'standalone', 'id': 'A'}), ('listener', {'port': listen_port, 'authenticatePeer': False, 'saslMechanisms': 'ANONYMOUS'})]) - cls.router = Qdrouterd(name="A", config=config, wait=True) + cls.router = cls.tester.qdrouterd(name="A", config=config, wait=True) def test_one_router_rejected_counts(self): address = self.router.addresses[0] @@ -96,7 +96,7 @@ class OneRouterReleasedDroppedPresettledTest(TestCase): ('address', {'prefix': 'multicast', 'distribution': 'multicast'}), ('listener', {'port': listen_port, 'authenticatePeer': False, 'saslMechanisms': 'ANONYMOUS'})]) - cls.router = Qdrouterd(name="A", config=config, wait=True) + cls.router = cls.tester.qdrouterd(name="A", config=config, wait=True) def test_one_router_released_dropped_counts(self): address = self.router.addresses[0] @@ -364,7 +364,7 @@ class OneRouterIngressEgressTest(TestCase): ('router', {'mode': 'standalone', 'id': 'A'}), ('listener', {'port': listen_port, 'authenticatePeer': False, 'saslMechanisms': 'ANONYMOUS'})]) - cls.router = Qdrouterd(name="A", config=config, wait=True) + cls.router = cls.tester.qdrouterd(name="A", config=config, wait=True) def test_one_router_ingress_egress_counts(self): address = self.router.addresses[0] @@ -408,7 +408,7 @@ class RouteContainerEgressCount(TestCase): ('autoLink', {'addr': 'myListener.1', 'connection': 'myListener', 'direction': 'out'}), ]) - cls.router = Qdrouterd(name="A", config=config, wait=True) + cls.router = cls.tester.qdrouterd(name="A", config=config, wait=True) def test_route_container_egress(self): regular_addr = self.router.addresses[0] @@ -449,7 +449,7 @@ class RouteContainerIngressCount(TestCase): ('autoLink', {'addr': 'myListener.1', 'connection': 'myListener', 'direction': 'out'}), ]) - cls.router = Qdrouterd(name="A", config=config, wait=True) + cls.router = cls.tester.qdrouterd(name="A", config=config, wait=True) def test_route_container_ingress(self): regular_addr = self.router.addresses[0] http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/42a4666f/tests/system_tests_http.py ---------------------------------------------------------------------- diff --git a/tests/system_tests_http.py b/tests/system_tests_http.py index 5a06e20..70c87c4 100644 --- a/tests/system_tests_http.py +++ b/tests/system_tests_http.py @@ -85,7 +85,7 @@ class RouterTestHttp(TestCase): ('router', {'mode': 'standalone', 'id': 'bad'}), ('listener', {'port': listen_port, 'maxFrameSize': '2048', 'stripAnnotations': 'no'}), ('listener', {'port': listen_port, 'http':True})]) - r = Qdrouterd(name="expect_fail", config=config, wait=False); + r = Qdrouterd(name="expect_fail", config=config, wait=False) self.assertEqual(1, r.wait()) def test_http_listener_delete(self): @@ -96,7 +96,7 @@ class RouterTestHttp(TestCase): ('router', {'mode': 'standalone', 'id': 'A'}), ('listener', {'port': normal_listen_port, 'maxFrameSize': '2048', 'stripAnnotations': 'no'}), ('listener', {'name': name, 'port': http_delete_listen_port, 'http': True})]) - router = Qdrouterd(name="expect_fail", config=config, wait=True) + router = self.qdrouterd(name="expect_fail_1", config=config, wait=True) exception_occurred = False def address(): @@ -112,7 +112,6 @@ class RouterTestHttp(TestCase): self.assertTrue(exception_occurred) - def test_http_get(self): if not sys.version_info >= (2, 9): --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
