[qpid-dispatch] branch master updated: DISPATCH-1607: Fix system_tests_one_router timing edge case

[ch...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

chug pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git


The following commit(s) were added to refs/heads/master by this push:
     new 4ce0d49  DISPATCH-1607: Fix system_tests_one_router timing edge case
4ce0d49 is described below

commit 4ce0d49c34464e1c0fbc47afa2096f191cb904c2
Author: Chuck Rolke <ch...@apache.org>
AuthorDate: Fri Mar 20 10:15:56 2020 -0400

    DISPATCH-1607: Fix system_tests_one_router timing edge case
    
    * Add allowance for integer scheduling and reporting intervals
    * Reduce test time from 7 to 3 seconds
    
    This closes #706
---
 tests/system_tests_one_router.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/tests/system_tests_one_router.py b/tests/system_tests_one_router.py
index acc74dd..b39b116 100644
--- a/tests/system_tests_one_router.py
+++ b/tests/system_tests_one_router.py
@@ -2650,8 +2650,11 @@ class ConnectionUptimeLastDlvTest(MessagingHandler):
 
             # We have now sent a message that the router must have sent to the
             # receiver. We will wait for 2 seconds and once again check
-            # uptime and lastDlv
-            self.custom_timer = self.reactor.schedule(2, UptimeLastDlvChecker(self, uptime=7, lastDlv=2))
+            # uptime and lastDlv.
+            # Allow for some slop in the calculation of uptime and last delivery:
+            # * reactor.schedule needs leeway in calculating the time delta and delivering the callback
+            # * dispatch needs leeway rounding stats to whole seconds
+            self.custom_timer = self.reactor.schedule(2, UptimeLastDlvChecker(self, uptime=2, lastDlv=1))
 
     def timeout(self):
         self.error = "Timeout Expired:, Test took too long to execute. "
@@ -2667,11 +2670,11 @@ class ConnectionUptimeLastDlvTest(MessagingHandler):
         self.sender = event.container.create_sender(self.sender_conn, self.dest)
         self.receiver = event.container.create_receiver(self.receiver_conn, self.dest)
 
-        # Execute a management query for connections after 5 seconds
+        # Execute a management query for connections after 1 second
         # This will help us check the uptime and lastDlv time
         # No deliveries were sent on any link yet, so the lastDlv must be "-"
         self.reactor = event.reactor
-        self.custom_timer = event.reactor.schedule(5, UptimeLastDlvChecker(self, uptime=5, lastDlv=None))
+        self.custom_timer = event.reactor.schedule(1, UptimeLastDlvChecker(self, uptime=1, lastDlv=None))
 
     def run(self):
         container = Container(self)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org