Repository: qpid-dispatch Updated Branches: refs/heads/master 8f92b2029 -> 5e61dd9a9
DISPATCH-739: Use default system_test.TIMEOUT for all tests valgrind requires longer timeouts, you can set a shorter one for non-valgrind tests with env. var. QPID_SYSTEM_TEST_TIMEOUT. Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/92020aa7 Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/92020aa7 Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/92020aa7 Branch: refs/heads/master Commit: 92020aa78417e4f478dad4079e27e2a9be62233f Parents: 8f92b20 Author: Alan Conway <[email protected]> Authored: Tue Apr 25 17:34:12 2017 -0400 Committer: Alan Conway <[email protected]> Committed: Tue Apr 25 17:42:25 2017 -0400 ---------------------------------------------------------------------- tests/system_tests_autolinks.py | 14 +++---- .../system_tests_denied_unsettled_multicast.py | 12 +++--- tests/system_tests_drain_support.py | 7 ++-- tests/system_tests_dynamic_terminus.py | 4 +- tests/system_tests_failover_list.py | 12 +++--- tests/system_tests_link_routes.py | 17 ++++---- tests/system_tests_multi_tenancy.py | 20 +++++----- tests/system_tests_one_router.py | 14 +++---- tests/system_tests_three_routers.py | 42 ++++++++++---------- tests/system_tests_two_routers.py | 4 +- 10 files changed, 73 insertions(+), 73 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/92020aa7/tests/system_tests_autolinks.py ---------------------------------------------------------------------- diff --git a/tests/system_tests_autolinks.py b/tests/system_tests_autolinks.py index 928cf5c..1776e93 100644 --- a/tests/system_tests_autolinks.py +++ b/tests/system_tests_autolinks.py @@ -19,7 +19,7 @@ import unittest from proton import Message, Delivery, PENDING, ACCEPTED, REJECTED -from system_test import TestCase, Qdrouterd, main_module +from system_test import TestCase, Qdrouterd, main_module, TIMEOUT from proton.handlers import MessagingHandler from proton.reactor import Container, AtMostOnce, AtLeastOnce @@ -192,7 +192,7 @@ class AutolinkAttachTest(MessagingHandler): self.conn.close() def on_start(self, event): - self.timer = event.reactor.schedule(5, Timeout(self)) + self.timer = event.reactor.schedule(TIMEOUT, Timeout(self)) self.conn = event.container.connect(self.address) def on_connection_closed(self, event): @@ -243,7 +243,7 @@ class AutolinkCreditTest(MessagingHandler): self.route_conn.close() def on_start(self, event): - self.timer = event.reactor.schedule(5, Timeout(self)) + self.timer = event.reactor.schedule(TIMEOUT, Timeout(self)) self.normal_conn = event.container.connect(self.normal_address) self.sender = event.container.create_sender(self.normal_conn, self.dest) self.last_action = "Attached normal sender" @@ -299,7 +299,7 @@ class AutolinkSenderTest(MessagingHandler): self.route_conn.close() def on_start(self, event): - self.timer = event.reactor.schedule(5, Timeout(self)) + self.timer = event.reactor.schedule(TIMEOUT, Timeout(self)) self.route_conn = event.container.connect(self.route_address) self.last_action = "Connected route container" @@ -365,7 +365,7 @@ class AutolinkReceiverTest(MessagingHandler): self.route_conn.close() def on_start(self, event): - self.timer = event.reactor.schedule(5, Timeout(self)) + self.timer = event.reactor.schedule(TIMEOUT, Timeout(self)) self.route_conn = event.container.connect(self.route_address) self.last_action = "Connected route container" @@ -426,7 +426,7 @@ class InterContainerTransferTest(MessagingHandler): self.conn_2.close() def on_start(self, event): - self.timer = event.reactor.schedule(5, Timeout(self)) + self.timer = event.reactor.schedule(TIMEOUT, Timeout(self)) event.container.container_id = 'container.2' self.conn_1 = event.container.connect(self.route_address) event.container.container_id = 'container.3' @@ -483,7 +483,7 @@ class ManageAutolinksTest(MessagingHandler): self.route_conn.close() def on_start(self, event): - self.timer = event.reactor.schedule(5, Timeout(self)) + self.timer = event.reactor.schedule(TIMEOUT, Timeout(self)) event.container.container_id = 'container.new' self.route_conn = event.container.connect(self.route_address) self.normal_conn = event.container.connect(self.normal_address) http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/92020aa7/tests/system_tests_denied_unsettled_multicast.py ---------------------------------------------------------------------- diff --git a/tests/system_tests_denied_unsettled_multicast.py b/tests/system_tests_denied_unsettled_multicast.py index 3008fcc..b139733 100644 --- a/tests/system_tests_denied_unsettled_multicast.py +++ b/tests/system_tests_denied_unsettled_multicast.py @@ -30,7 +30,7 @@ try: except ImportError: from proton import PN_STATUS_MODIFIED as MODIFIED - + class RouterTest(TestCase): inter_router_port = None @@ -41,21 +41,21 @@ class RouterTest(TestCase): super(RouterTest, cls).setUpClass() def router(name): - + config = [ ('router', {'mode': 'standalone', 'id': name}), ('listener', {'port': cls.tester.get_port()}), ('address', {'prefix': 'multicast', 'distribution' : 'multicast'}), ] - + config = Qdrouterd.Config(config) cls.routers.append(cls.tester.qdrouterd(name, config, wait=True)) cls.routers = [] - + inter_router_port = cls.tester.get_port() - + router('A') cls.routers[0].wait_ready() @@ -107,7 +107,7 @@ class DeniedUnsettledMulticastTest(MessagingHandler): self.sent_pres += 1 def on_start(self, event): - self.timer = event.reactor.schedule(5, Timeout(self)) + self.timer = event.reactor.schedule(TIMEOUT, Timeout(self)) self.conn = event.container.connect(self.host) self.receiver = event.container.create_receiver(self.conn, self.addr) self.sender = event.container.create_sender(self.conn, self.addr) http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/92020aa7/tests/system_tests_drain_support.py ---------------------------------------------------------------------- diff --git a/tests/system_tests_drain_support.py b/tests/system_tests_drain_support.py index e59f870..661cf20 100644 --- a/tests/system_tests_drain_support.py +++ b/tests/system_tests_drain_support.py @@ -20,6 +20,7 @@ from proton.handlers import MessagingHandler from proton.reactor import Container from proton import Message, Endpoint +from system_test import TIMEOUT class Timeout(object): def __init__(self, parent): @@ -46,7 +47,7 @@ class DrainMessagesHandler(MessagingHandler): self.conn.close() def on_start(self, event): - self.timer = event.reactor.schedule(5, Timeout(self)) + self.timer = event.reactor.schedule(TIMEOUT, Timeout(self)) self.conn = event.container.connect(self.address) # Create a sender and a receiver. They are both listening on the same address @@ -137,7 +138,7 @@ class DrainNoMessagesHandler(MessagingHandler): self.conn.close() def on_start(self, event): - self.timer = event.reactor.schedule(5, Timeout(self)) + self.timer = event.reactor.schedule(TIMEOUT, Timeout(self)) self.conn = event.container.connect(self.address) # Create a sender and a receiver. They are both listening on the same address @@ -175,7 +176,7 @@ class DrainNoMoreMessagesHandler(MessagingHandler): self.conn.close() def on_start(self, event): - self.timer = event.reactor.schedule(5, Timeout(self)) + self.timer = event.reactor.schedule(TIMEOUT, Timeout(self)) self.conn = event.container.connect(self.address) # Create a sender and a receiver. They are both listening on the same address http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/92020aa7/tests/system_tests_dynamic_terminus.py ---------------------------------------------------------------------- diff --git a/tests/system_tests_dynamic_terminus.py b/tests/system_tests_dynamic_terminus.py index 39606d3..bd43cf3 100644 --- a/tests/system_tests_dynamic_terminus.py +++ b/tests/system_tests_dynamic_terminus.py @@ -123,7 +123,7 @@ class DynamicSourceTest(MessagingHandler): self.receiver_conn.close() def on_start(self, event): - self.timer = event.reactor.schedule(5, Timeout(self)) + self.timer = event.reactor.schedule(TIMEOUT, Timeout(self)) self.sender_1_conn = event.container.connect(self.router_1_host) self.sender_2_conn = event.container.connect(self.router_2_host) @@ -203,7 +203,7 @@ class DynamicTargetTest(MessagingHandler): self.receiver_conn.close() def on_start(self, event): - self.timer = event.reactor.schedule(5, Timeout(self)) + self.timer = event.reactor.schedule(TIMEOUT, Timeout(self)) self.sender_conn = event.container.connect(self.sender_host) self.receiver_conn = event.container.connect(self.receiver_host) http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/92020aa7/tests/system_tests_failover_list.py ---------------------------------------------------------------------- diff --git a/tests/system_tests_failover_list.py b/tests/system_tests_failover_list.py index b7cc30b..af76835 100644 --- a/tests/system_tests_failover_list.py +++ b/tests/system_tests_failover_list.py @@ -30,7 +30,7 @@ try: except ImportError: from proton import PN_STATUS_MODIFIED as MODIFIED - + class RouterTest(TestCase): inter_router_port = None @@ -41,22 +41,22 @@ class RouterTest(TestCase): super(RouterTest, cls).setUpClass() def router(name): - + config = [ ('router', {'mode': 'standalone', 'id': name}), ('listener', {'port': cls.tester.get_port()}), ('listener', {'port': cls.tester.get_port(), 'failoverList': 'other-host:25000'}), ('listener', {'port': cls.tester.get_port(), 'failoverList': 'second-host:25000, amqps://third-host:5671'}) ] - + config = Qdrouterd.Config(config) cls.routers.append(cls.tester.qdrouterd(name, config, wait=True)) cls.routers = [] - + inter_router_port = cls.tester.get_port() - + router('A') cls.routers[0].wait_ready() @@ -100,7 +100,7 @@ class FailoverTest(MessagingHandler): self.conn.close() def on_start(self, event): - self.timer = event.reactor.schedule(5, Timeout(self)) + self.timer = event.reactor.schedule(TIMEOUT, Timeout(self)) self.conn = event.container.connect(self.host) def on_connection_opened(self, event): http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/92020aa7/tests/system_tests_link_routes.py ---------------------------------------------------------------------- diff --git a/tests/system_tests_link_routes.py b/tests/system_tests_link_routes.py index 7aed283..6dfb387 100644 --- a/tests/system_tests_link_routes.py +++ b/tests/system_tests_link_routes.py @@ -620,7 +620,7 @@ class DeliveryTagsTest(MessagingHandler): self.sender_connection.close() def on_start(self, event): - self.timer = event.reactor.schedule(5, Timeout(self)) + self.timer = event.reactor.schedule(TIMEOUT, Timeout(self)) self.receiver_connection = event.container.connect(self.listening_address) def on_connection_remote_open(self, event): @@ -692,7 +692,7 @@ class CloseWithUnsettledTest(MessagingHandler): self.conn_route.close() def on_start(self, event): - self.timer = event.reactor.schedule(5, Timeout(self)) + self.timer = event.reactor.schedule(TIMEOUT, Timeout(self)) self.conn_route = event.container.connect(self.route_addr) def on_connection_opened(self, event): @@ -740,7 +740,7 @@ class DynamicSourceTest(MessagingHandler): self.conn_route.close() def on_start(self, event): - self.timer = event.reactor.schedule(5, Timeout(self)) + self.timer = event.reactor.schedule(TIMEOUT, Timeout(self)) self.conn_route = event.container.connect(self.route_addr) def on_connection_opened(self, event): @@ -797,7 +797,7 @@ class DynamicTargetTest(MessagingHandler): self.conn_route.close() def on_start(self, event): - self.timer = event.reactor.schedule(5, Timeout(self)) + self.timer = event.reactor.schedule(TIMEOUT, Timeout(self)) self.conn_route = event.container.connect(self.route_addr) def on_connection_opened(self, event): @@ -850,9 +850,9 @@ class DetachNoCloseTest(MessagingHandler): self.conn_normal.close() self.conn_route.close() self.timer.cancel() - + def on_start(self, event): - self.timer = event.reactor.schedule(5, Timeout(self)) + self.timer = event.reactor.schedule(TIMEOUT, Timeout(self)) self.conn_route = event.container.connect(self.route_addr) def on_connection_opened(self, event): @@ -913,9 +913,9 @@ class DetachMixedCloseTest(MessagingHandler): self.conn_normal.close() self.conn_route.close() self.timer.cancel() - + def on_start(self, event): - self.timer = event.reactor.schedule(5, Timeout(self)) + self.timer = event.reactor.schedule(TIMEOUT, Timeout(self)) self.conn_route = event.container.connect(self.route_addr) def on_connection_opened(self, event): @@ -1069,4 +1069,3 @@ class TerminusAddrTest(MessagingHandler): if __name__ == '__main__': unittest.main(main_module()) - http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/92020aa7/tests/system_tests_multi_tenancy.py ---------------------------------------------------------------------- diff --git a/tests/system_tests_multi_tenancy.py b/tests/system_tests_multi_tenancy.py index 0430d98..3e4a16d 100644 --- a/tests/system_tests_multi_tenancy.py +++ b/tests/system_tests_multi_tenancy.py @@ -30,7 +30,7 @@ try: except ImportError: from proton import PN_STATUS_MODIFIED as MODIFIED - + class RouterTest(TestCase): inter_router_port = None @@ -41,7 +41,7 @@ class RouterTest(TestCase): super(RouterTest, cls).setUpClass() def router(name, connection): - + config = [ ('router', {'mode': 'interior', 'id': name}), ('listener', {'port': cls.tester.get_port(), 'stripAnnotations': 'no'}), @@ -57,15 +57,15 @@ class RouterTest(TestCase): ('address', {'prefix': '0.0.0.0/queue', 'waypoint': 'yes'}), connection ] - + config = Qdrouterd.Config(config) cls.routers.append(cls.tester.qdrouterd(name, config, wait=True)) cls.routers = [] - + inter_router_port = cls.tester.get_port() - + router('A', ('listener', {'role': 'inter-router', 'port': inter_router_port})) router('B', ('connector', {'name': 'connectorToA', 'role': 'inter-router', 'port': inter_router_port, 'verifyHostName': 'no'})) @@ -494,7 +494,7 @@ class MessageTransferTest(MessagingHandler): self.lookup_conn.close() def on_start(self, event): - self.timer = event.reactor.schedule(10, Timeout(self)) + self.timer = event.reactor.schedule(TIMEOUT, Timeout(self)) self.sender_conn = event.container.connect(self.sender_host) self.receiver_conn = event.container.connect(self.receiver_host) self.lookup_conn = event.container.connect(self.lookup_host) @@ -535,7 +535,7 @@ class MessageTransferTest(MessagingHandler): self.receiver_conn.close() self.lookup_conn.close() self.timer.cancel() - + def on_accepted(self, event): if event.sender == self.sender: self.n_accepted += 1 @@ -587,7 +587,7 @@ class MessageTransferAnonTest(MessagingHandler): self.poll() def on_start(self, event): - self.timer = event.reactor.schedule(10, Timeout(self)) + self.timer = event.reactor.schedule(TIMEOUT, Timeout(self)) self.poll_timer = None self.sender_conn = event.container.connect(self.sender_host) self.receiver_conn = event.container.connect(self.receiver_host) @@ -714,7 +714,7 @@ class LinkRouteTest(MessagingHandler): def on_start(self, event): - self.timer = event.reactor.schedule(10, Timeout(self)) + self.timer = event.reactor.schedule(TIMEOUT, Timeout(self)) self.first_conn = event.container.connect(self.first_host) self.second_conn = event.container.connect(self.second_host) self.lookup_conn = event.container.connect(self.lookup_host) @@ -833,7 +833,7 @@ class WaypointTest(MessagingHandler): self.waypoint_sender.send(m) def on_start(self, event): - self.timer = event.reactor.schedule(10, Timeout(self)) + self.timer = event.reactor.schedule(TIMEOUT, Timeout(self)) self.first_conn = event.container.connect(self.first_host) self.second_conn = event.container.connect(self.second_host) http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/92020aa7/tests/system_tests_one_router.py ---------------------------------------------------------------------- diff --git a/tests/system_tests_one_router.py b/tests/system_tests_one_router.py index 0f0cc81..0a982c7 100644 --- a/tests/system_tests_one_router.py +++ b/tests/system_tests_one_router.py @@ -19,7 +19,7 @@ import unittest from proton import Condition, Message, Delivery, PENDING, ACCEPTED, REJECTED -from system_test import TestCase, Qdrouterd, main_module +from system_test import TestCase, Qdrouterd, main_module, TIMEOUT from proton.handlers import MessagingHandler from proton.reactor import Container, AtMostOnce, AtLeastOnce from proton.utils import BlockingConnection, SyncRequestResponse @@ -1247,7 +1247,7 @@ class MulticastUnsettledTest(MessagingHandler): self.conn.close() def on_start(self, event): - self.timer = event.reactor.schedule(5, Timeout(self)) + self.timer = event.reactor.schedule(TIMEOUT, Timeout(self)) self.conn = event.container.connect(self.address) self.sender = event.container.create_sender(self.conn, self.dest) self.receiver1 = event.container.create_receiver(self.conn, self.dest, name="A") @@ -1299,7 +1299,7 @@ class MultiframePresettledTest(MessagingHandler): self.conn.close() def on_start(self, event): - self.timer = event.reactor.schedule(5, Timeout(self)) + self.timer = event.reactor.schedule(TIMEOUT, Timeout(self)) self.conn = event.container.connect(self.address) self.sender = event.container.create_sender(self.conn, self.dest) self.receiver = event.container.create_receiver(self.conn, self.dest, name="A") @@ -1346,7 +1346,7 @@ class ReleasedVsModifiedTest(MessagingHandler): self.conn.close() def on_start(self, event): - self.timer = event.reactor.schedule(5, Timeout(self)) + self.timer = event.reactor.schedule(TIMEOUT, Timeout(self)) self.conn = event.container.connect(self.address) self.sender = event.container.create_sender(self.conn, self.dest) self.receiver = event.container.create_receiver(self.conn, self.dest, name="A") @@ -1399,7 +1399,7 @@ class AppearanceOfBalanceTest(MessagingHandler): self.conn.close() def on_start(self, event): - self.timer = event.reactor.schedule(5, Timeout(self)) + self.timer = event.reactor.schedule(TIMEOUT, Timeout(self)) self.conn = event.container.connect(self.address) self.sender = event.container.create_sender(self.conn, self.dest) self.receiver_a = event.container.create_receiver(self.conn, self.dest, name="A") @@ -1456,7 +1456,7 @@ class BatchedSettlementTest(MessagingHandler): self.conn.close() def on_start(self, event): - self.timer = event.reactor.schedule(10, Timeout(self)) + self.timer = event.reactor.schedule(TIMEOUT, Timeout(self)) self.conn = event.container.connect(self.address) self.sender = event.container.create_sender(self.conn, self.dest) self.receiver = event.container.create_receiver(self.conn, self.dest) @@ -1501,7 +1501,7 @@ class PresettledOverflowTest(MessagingHandler): self.conn.close() def on_start(self, event): - self.timer = event.reactor.schedule(5, Timeout(self)) + self.timer = event.reactor.schedule(TIMEOUT, Timeout(self)) self.conn = event.container.connect(self.address) self.sender = event.container.create_sender(self.conn, self.dest) self.receiver = event.container.create_receiver(self.conn, self.dest) http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/92020aa7/tests/system_tests_three_routers.py ---------------------------------------------------------------------- diff --git a/tests/system_tests_three_routers.py b/tests/system_tests_three_routers.py index 19bed4d..83719e5 100644 --- a/tests/system_tests_three_routers.py +++ b/tests/system_tests_three_routers.py @@ -43,12 +43,12 @@ class RouterTest(TestCase): super(RouterTest, cls).setUpClass() def router(name, connection_1, connection_2=None): - + config = [ ('router', {'mode': 'interior', 'id': 'QDR.%s'%name}), - + ('listener', {'port': cls.tester.get_port(), 'stripAnnotations': 'no'}), - + ('address', {'prefix': 'closest', 'distribution': 'closest'}), ('address', {'prefix': 'spread', 'distribution': 'balanced'}), ('address', {'prefix': 'multicast', 'distribution': 'multicast'}) @@ -56,17 +56,17 @@ class RouterTest(TestCase): config.append(connection_1) if None != connection_2: config.append(connection_2) - + config = Qdrouterd.Config(config) cls.routers.append(cls.tester.qdrouterd(name, config, wait=True)) cls.routers = [] - + inter_router_port_1 = cls.tester.get_port() inter_router_port_2 = cls.tester.get_port() - # A <--- B <--- C + # A <--- B <--- C router('A', ('listener', {'role': 'inter-router', 'port': inter_router_port_1}) ) router('B', ('listener', {'role': 'inter-router', 'port': inter_router_port_2}), @@ -120,7 +120,7 @@ class TargetedSenderTest(MessagingHandler): def on_start(self, event): # receiver <--- A <--- B <---- C <--- sender - self.timer = event.reactor.schedule(5, Timeout(self)) + self.timer = event.reactor.schedule(TIMEOUT, Timeout(self)) self.conn1 = event.container.connect(self.address1) self.conn2 = event.container.connect(self.address2) self.sender = event.container.create_sender(self.conn1, self.dest) @@ -146,8 +146,8 @@ class TargetedSenderTest(MessagingHandler): def run(self): Container(self).run() - - + + class AnonymousSenderTest(MessagingHandler): def __init__(self, address1, address2): @@ -162,13 +162,13 @@ class AnonymousSenderTest(MessagingHandler): self.n_sent = 0 self.n_received = 0 self.n_accepted = 0 - + def timeout(self): self.error = "Timeout Expired %d messages received." % self.n_received self.conn1.close() self.conn2.close() - - # The problem with using an anonymous sender in a router + + # The problem with using an anonymous sender in a router # network is that it takes finite time for endpoint information # to propagate around the network. It is possible for me to # start sending before my router knows how to route my messages, @@ -176,7 +176,7 @@ class AnonymousSenderTest(MessagingHandler): # doomed to wait eternally for the tenth message to be received. # To fix this, we will detect released messages here, and decrement # the sent message counter, forcing a resend for each drop. - # And also pause for a moment, since we know that the network is + # And also pause for a moment, since we know that the network is # not yet ready. def on_released(self, event): self.n_sent -= 1 @@ -187,27 +187,27 @@ class AnonymousSenderTest(MessagingHandler): # This sender has no destination addr, so we will have to # address each message individually. # Also -- Create the sender here, when we know that the - # receiver link has opened, because then we are at least + # receiver link has opened, because then we are at least # close to being able to send. (See comment above.) self.sender = event.container.create_sender(self.conn1, None) def on_start(self, event): - self.timer = event.reactor.schedule(5, Timeout(self)) + self.timer = event.reactor.schedule(TIMEOUT, Timeout(self)) self.conn1 = event.container.connect(self.address1) self.conn2 = event.container.connect(self.address2) self.receiver = event.container.create_receiver(self.conn2, self.dest) self.receiver.flow(self.n_expected) - + def on_sendable(self, event): if self.n_sent < self.n_expected: # Add the destination addr to each message. msg = Message(body=self.n_sent, address=self.dest) event.sender.send(msg) self.n_sent += 1 - + def on_accepted(self, event): self.n_accepted += 1 - + def on_message(self, event): self.n_received += 1 if self.n_received == self.n_expected: @@ -218,8 +218,8 @@ class AnonymousSenderTest(MessagingHandler): def run(self): Container(self).run() - - - + + + if __name__ == '__main__': unittest.main(main_module()) http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/92020aa7/tests/system_tests_two_routers.py ---------------------------------------------------------------------- diff --git a/tests/system_tests_two_routers.py b/tests/system_tests_two_routers.py index 7eec4b5..5e55b47 100644 --- a/tests/system_tests_two_routers.py +++ b/tests/system_tests_two_routers.py @@ -1082,7 +1082,7 @@ class ExcessDeliveriesReleasedTest(MessagingHandler): self.conn2.close() def on_start(self, event): - self.timer = event.reactor.schedule(5, Timeout(self)) + self.timer = event.reactor.schedule(TIMEOUT, Timeout(self)) self.conn1 = event.container.connect(self.address1) self.conn2 = event.container.connect(self.address2) self.sender = event.container.create_sender(self.conn1, self.dest) @@ -1132,7 +1132,7 @@ class AttachOnInterRouterTest(MessagingHandler): self.conn.close() def on_start(self, event): - self.timer = event.reactor.schedule(5, Timeout(self)) + self.timer = event.reactor.schedule(TIMEOUT, Timeout(self)) self.conn = event.container.connect(self.address) self.sender = event.container.create_sender(self.conn, self.dest) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
