summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <michael@clojurewerkz.org>2020-08-31 08:30:07 +0300
committerMichael Klishin <michael@clojurewerkz.org>2020-08-31 08:30:07 +0300
commit37641110273bdfe274d378a549cb9343980be8f2 (patch)
tree8e59bacdd4b2bcafaf12f2e3444e5e7a314d3be5
parentafad4d5a5ca325f3ad8f4b5ee76139ff8fcccaef (diff)
downloadrabbitmq-server-git-37641110273bdfe274d378a549cb9343980be8f2.tar.gz
Rework a flaky test
-rw-r--r--test/per_user_connection_channel_limit_SUITE.erl21
1 files changed, 3 insertions, 18 deletions
diff --git a/test/per_user_connection_channel_limit_SUITE.erl b/test/per_user_connection_channel_limit_SUITE.erl
index 95c72a17e1..35745d65f8 100644
--- a/test/per_user_connection_channel_limit_SUITE.erl
+++ b/test/per_user_connection_channel_limit_SUITE.erl
@@ -477,35 +477,20 @@ cluster_single_user_connection_and_channel_count(Config) ->
end),
[Conn4] = open_connections(Config, [1]),
- _Chans4 = [_|_] = open_channels(Conn4, 5),
- rabbit_ct_helpers:await_condition(
- fun () ->
- count_connections_of_user(Config, Username) =:= 3 andalso
- count_channels_of_user(Config, Username) =:= 15
- end),
-
- close_connections([Conn4]),
- rabbit_ct_helpers:await_condition(
- fun () ->
- count_connections_of_user(Config, Username) =:= 2 andalso
- count_channels_of_user(Config, Username) =:= 10
- end),
-
- [Conn5] = open_connections(Config, [1]),
- Chans5 = [_|_] = open_channels(Conn5, 5),
+ Chans4 = [_|_] = open_channels(Conn4, 5),
rabbit_ct_helpers:await_condition(
fun () ->
count_connections_of_user(Config, Username) =:= 3 andalso
count_channels_of_user(Config, Username) =:= 15
end),
- close_channels(Chans2 ++ Chans3 ++ Chans5),
+ close_channels(Chans2 ++ Chans3 ++ Chans4),
rabbit_ct_helpers:await_condition(
fun () ->
count_channels_of_user(Config, Username) =:= 0
end),
- close_connections([Conn2, Conn3, Conn5]),
+ close_connections([Conn2, Conn3, Conn4]),
rabbit_ct_helpers:await_condition(
fun () ->
count_connections_of_user(Config, Username) =:= 0