From e6c70322ebec47154e3482d7a020e221e83ff523 Mon Sep 17 00:00:00 2001 From: MSP-Greg Date: Wed, 18 Sep 2019 13:43:17 -0500 Subject: [PATCH] integration_cluster.rb - term_closes_listeners - add interleave asserts --- test/test_integration_cluster.rb | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/test/test_integration_cluster.rb b/test/test_integration_cluster.rb index 58f2612901..8625a4e6f1 100644 --- a/test/test_integration_cluster.rb +++ b/test/test_integration_cluster.rb @@ -147,8 +147,23 @@ def term_closes_listeners(unix: false) threads.each(&:join) responses = replies.count { |r| r[/\ASlept 1/] } - resets = replies.count { |r| r == :reset } - refused = replies.count { |r| r == :refused } + resets = replies.count(:reset) + refused = replies.count(:refused) + + r_responses = replies.rindex { |i| i[/\ASlept 1/] } + l_resets = replies.index(:reset) + r_resets = replies.rindex(:reset) + l_refused = replies.index(:refused) + + if l_resets + assert_equal(r_responses + 1, l_resets, "Interleaved responses & resets") + if l_refused + assert_equal(r_resets + 1, l_refused, "Interleaved resets & refused") + end + else + assert_equal(r_responses + 1, l_refused, "Interleaved responses & refused") + end + msg = "#{responses} responses, #{resets} resets, #{refused} refused" $debugging_info << "#{full_name}\n #{msg}\n"