This is an automated email from the ASF dual-hosted git repository. gmurthy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
The following commit(s) were added to refs/heads/main by this push: new 567d881 DISPATCH-2226: Give 4 seconds extra time for the router to either reject or accept deliveries. Also, turned on debug output 567d881 is described below commit 567d88167b5bd5c4a49e023041e8222b953a16d6 Author: Ganesh Murthy <gmur...@apache.org> AuthorDate: Mon Oct 18 10:01:15 2021 -0400 DISPATCH-2226: Give 4 seconds extra time for the router to either reject or accept deliveries. Also, turned on debug output --- tests/system_tests_topology_disposition.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/tests/system_tests_topology_disposition.py b/tests/system_tests_topology_disposition.py index 95346c9..dc5360b 100644 --- a/tests/system_tests_topology_disposition.py +++ b/tests/system_tests_topology_disposition.py @@ -368,8 +368,7 @@ class TopologyDispositionTests (TestCase): self.skipTest("Test skipped during development.") test = TopologyDisposition(name, self.client_addrs, - "closest/02" - ) + "closest/02", debug=True) test.run() self.assertIsNone(test.error) @@ -754,7 +753,7 @@ class TopologyDisposition (MessagingHandler): # send timer because it seemed more realistic to me -- more like a real application -- # and that implies sending bursts of messages. - def __init__(self, test_name, client_addrs, destination): + def __init__(self, test_name, client_addrs, destination, debug=False): super(TopologyDisposition, self).__init__(prefetch=10) self.dest = destination self.error = None @@ -770,7 +769,7 @@ class TopologyDisposition (MessagingHandler): self.state = None self.send_conn = None self.recv_conn = None - self.debug = False + self.debug = debug self.client_addrs = client_addrs self.timeout_count = 0 self.confirmed_kills = 0 @@ -841,6 +840,7 @@ class TopologyDisposition (MessagingHandler): self.routers['D']['mgmt_conn'].close() # Two separate timers. One controls sending in bursts, one ends the test. + # Two separate timers. One controls sending in bursts, one ends the test. def timeout(self, name): if self.state == 'bailing' : return @@ -885,7 +885,11 @@ class TopologyDisposition (MessagingHandler): self.state_transition('trouble duration exceeded limit: %d' % self.max_trouble_duration, 'post mortem') self.check_links() - self.send_timer = self.reactor.schedule(self.send_interval, Timeout(self, "sender")) + if self.state == 'done sending': + # wait a couple of seconds for all the deliveries to be either released or accepted. + self.send_timer = self.reactor.schedule(4.0, Timeout(self, "sender")) + else: + self.send_timer = self.reactor.schedule(self.send_interval, Timeout(self, "sender")) def on_start(self, event): self.state_transition('on_start', 'starting') @@ -894,7 +898,6 @@ class TopologyDisposition (MessagingHandler): self.send_timer = event.reactor.schedule(self.send_interval, Timeout(self, "sender")) self.send_conn = event.container.connect(self.client_addrs['A']) self.recv_conn = event.container.connect(self.client_addrs['B']) - self.sender = event.container.create_sender(self.send_conn, self.dest) self.receiver = event.container.create_receiver(self.recv_conn, self.dest) @@ -1032,7 +1035,6 @@ class TopologyDisposition (MessagingHandler): self.message_status[tag] = 'accepted' def on_released(self, event) : - if event.sender == self.sender: self.n_released += 1 tag = event.delivery.tag --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org