Repository: qpid-dispatch Updated Branches: refs/heads/master d49adbdb1 -> cf61d95d5
NO-JIRA - Fixed semantics-spread test to not expect perfect round-robin distribution. Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/cf61d95d Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/cf61d95d Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/cf61d95d Branch: refs/heads/master Commit: cf61d95d52b3738dbfa1bfbd984fa747847cfd8f Parents: d49adbd Author: Ted Ross <[email protected]> Authored: Wed Mar 30 15:49:56 2016 -0400 Committer: Ted Ross <[email protected]> Committed: Wed Mar 30 15:50:49 2016 -0400 ---------------------------------------------------------------------- tests/system_tests_one_router.py | 47 ++++++++++++++++++++++++++--------- 1 file changed, 35 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/cf61d95d/tests/system_tests_one_router.py ---------------------------------------------------------------------- diff --git a/tests/system_tests_one_router.py b/tests/system_tests_one_router.py index cfc3646..208765e 100644 --- a/tests/system_tests_one_router.py +++ b/tests/system_tests_one_router.py @@ -939,6 +939,9 @@ class RouterTest(TestCase): M3 = self.messenger() M4 = self.messenger() + M2.timeout = 0.1 + M3.timeout = 0.1 + M4.timeout = 0.1 M1.start() M2.start() @@ -960,20 +963,40 @@ class RouterTest(TestCase): i = 0 rx_set = [] - for i in range(10): - M2.recv(1) - M2.get(rm) - rx_set.append(rm.body['number']) - - M3.recv(1) - M3.get(rm) - rx_set.append(rm.body['number']) - - M4.recv(1) - M4.get(rm) - rx_set.append(rm.body['number']) + ca = 0 + cb = 0 + cc = 0 + + while len(rx_set) < 30: + try: + M2.recv(1) + M2.get(rm) + rx_set.append(rm.body['number']) + ca += 1 + except: + pass + + try: + M3.recv(1) + M3.get(rm) + rx_set.append(rm.body['number']) + cb += 1 + except: + pass + + try: + M4.recv(1) + M4.get(rm) + rx_set.append(rm.body['number']) + cc += 1 + except: + pass self.assertEqual(30, len(rx_set)) + self.assertTrue(ca > 0) + self.assertTrue(cb > 0) + self.assertTrue(cc > 0) + rx_set.sort() for i in range(30): self.assertEqual(i, rx_set[i]) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
