summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <michael@clojurewerkz.org>2020-09-23 15:45:57 +0300
committerMichael Klishin <michael@clojurewerkz.org>2020-09-23 15:45:57 +0300
commit94765ad2d8c6a1e0e2deed1aeb8c03bdbfe33397 (patch)
tree62c6b5e952390254feb89f546bbc3c23b003adf6
parentf0ddddb3ad6ec3a3fdee70c6c7e6b2449f1f8b7a (diff)
downloadrabbitmq-server-git-94765ad2d8c6a1e0e2deed1aeb8c03bdbfe33397.tar.gz
Fix one more timing-sensitive per_user_connection_channel_limit suite test
-rw-r--r--test/per_user_connection_channel_limit_SUITE.erl28
1 files changed, 22 insertions, 6 deletions
diff --git a/test/per_user_connection_channel_limit_SUITE.erl b/test/per_user_connection_channel_limit_SUITE.erl
index 5ad2ba805b..9dbc2afbe5 100644
--- a/test/per_user_connection_channel_limit_SUITE.erl
+++ b/test/per_user_connection_channel_limit_SUITE.erl
@@ -364,8 +364,12 @@ single_node_list_in_user(Config) ->
set_up_user(Config, Username1),
set_up_user(Config, Username2),
- ?assertEqual(0, length(connections_in(Config, Username1))),
- ?assertEqual(0, length(connections_in(Config, Username2))),
+ rabbit_ct_helpers:await_condition(
+ fun () ->
+ length(connections_in(Config, Username1)) =:= 0 andalso
+ length(connections_in(Config, Username2)) =:= 0
+ end),
+
?assertEqual(0, length(channels_in(Config, Username1))),
?assertEqual(0, length(channels_in(Config, Username2))),
@@ -374,9 +378,15 @@ single_node_list_in_user(Config) ->
[#tracked_connection{username = Username1}] = connections_in(Config, Username1),
[#tracked_channel{username = Username1}] = channels_in(Config, Username1),
close_channels([Chan1]),
- ?assertEqual(0, length(channels_in(Config, Username1))),
+ rabbit_ct_helpers:await_condition(
+ fun () ->
+ length(channels_in(Config, Username1)) =:= 0
+ end),
close_connections([Conn1]),
- ?assertEqual(0, length(connections_in(Config, Username1))),
+ rabbit_ct_helpers:await_condition(
+ fun () ->
+ length(connections_in(Config, Username1)) =:= 0
+ end),
[Conn2] = open_connections(Config, [{0, Username2}]),
[Chan2] = open_channels(Conn2, 1),
@@ -405,10 +415,16 @@ single_node_list_in_user(Config) ->
all_channels(Config))),
close_channels([Chan2, Chan3, Chan5, Chan6]),
- ?assertEqual(0, length(all_channels(Config))),
+ rabbit_ct_helpers:await_condition(
+ fun () ->
+ length(all_channels(Config)) =:= 0
+ end),
close_connections([Conn2, Conn3, Conn5, Conn6]),
- ?assertEqual(0, length(all_connections(Config))),
+ rabbit_ct_helpers:await_condition(
+ fun () ->
+ length(all_connections(Config)) =:= 0
+ end),
rabbit_ct_broker_helpers:delete_user(Config, Username1),
rabbit_ct_broker_helpers:delete_user(Config, Username2).