Skip to content

Commit 07f39c6

Browse files
mkuratczykmkuratczyk
committed
Deflake per_user_connection_tracking_SUITE
1 parent 33bdb95 commit 07f39c6

File tree

1 file changed

+41
-35
lines changed

1 file changed

+41
-35
lines changed

‎deps/rabbit/test/per_user_connection_tracking_SUITE.erl‎

Lines changed: 41 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -100,60 +100,64 @@ end_per_testcase(Testcase, Config) ->
100100
%% Test cases.
101101
%% -------------------------------------------------------------------
102102
single_node_list_of_user(Config) ->
103-
Username = proplists:get_value(rmq_username, Config),
104-
Username2 = <<"guest2">>,
103+
Username1 = list_to_binary(atom_to_list(?FUNCTION_NAME) ++ "-1"),
104+
Username2 = list_to_binary(atom_to_list(?FUNCTION_NAME) ++ "-2"),
105105

106106
Vhost = proplists:get_value(rmq_vhost, Config),
107107

108-
rabbit_ct_broker_helpers:add_user(Config, Username2),
109-
rabbit_ct_broker_helpers:set_full_permissions(Config, Username2, Vhost),
108+
[ begin
109+
rabbit_ct_broker_helpers:add_user(Config, U),
110+
rabbit_ct_broker_helpers:set_full_permissions(Config, U, Vhost)
111+
end || U <- [Username1, Username2]],
110112

111-
?assertEqual(0, count_connections_in(Config, Username)),
113+
?assertEqual(0, count_connections_in(Config, Username1)),
112114
?assertEqual(0, count_connections_in(Config, Username2)),
113115

114-
[Conn1] = open_connections(Config, [0]),
115-
?awaitMatch(1, count_connections_in(Config, Username), ?AWAIT_TIMEOUT),
116-
[#tracked_connection{username = Username}] = connections_in(Config, Username),
116+
[Conn1] = open_connections(Config, [{0, Username1}]),
117+
?awaitMatch(1, count_connections_in(Config, Username1), ?AWAIT_TIMEOUT),
118+
[#tracked_connection{username = Username1}] = connections_in(Config, Username1),
117119
close_connections([Conn1]),
118-
?awaitMatch(0, count_connections_in(Config, Username), ?AWAIT_TIMEOUT),
120+
?awaitMatch(0, count_connections_in(Config, Username1), ?AWAIT_TIMEOUT),
119121

120122
[Conn2] = open_connections(Config, [{0, Username2}]),
121123
?awaitMatch(1, count_connections_in(Config, Username2), ?AWAIT_TIMEOUT),
122124
[#tracked_connection{username = Username2}] = connections_in(Config, Username2),
123125

124-
[Conn3] = open_connections(Config, [0]),
125-
?awaitMatch(1, count_connections_in(Config, Username), ?AWAIT_TIMEOUT),
126-
[#tracked_connection{username = Username}] = connections_in(Config, Username),
126+
[Conn3] = open_connections(Config, [{0, Username1}]),
127+
?awaitMatch(1, count_connections_in(Config, Username1), ?AWAIT_TIMEOUT),
128+
[#tracked_connection{username = Username1}] = connections_in(Config, Username1),
127129

128-
[Conn4] = open_connections(Config, [0]),
130+
[Conn4] = open_connections(Config, [{0, Username1}]),
129131
kill_connections([Conn4]),
130-
?awaitMatch(1, count_connections_in(Config, Username), ?AWAIT_TIMEOUT),
131-
[#tracked_connection{username = Username}] = connections_in(Config, Username),
132+
?awaitMatch(1, count_connections_in(Config, Username1), ?AWAIT_TIMEOUT),
133+
[#tracked_connection{username = Username1}] = connections_in(Config, Username1),
132134

133-
[Conn5] = open_connections(Config, [0]),
134-
?awaitMatch(2, count_connections_in(Config, Username), ?AWAIT_TIMEOUT),
135-
[Username, Username] =
135+
[Conn5] = open_connections(Config, [{0, Username1}]),
136+
?awaitMatch(2, count_connections_in(Config, Username1), ?AWAIT_TIMEOUT),
137+
[Username1, Username1] =
136138
lists:map(fun (#tracked_connection{username = U}) -> U end,
137-
connections_in(Config, Username)),
139+
connections_in(Config, Username1)),
138140

139141
close_connections([Conn2, Conn3, Conn5]),
140142
rabbit_ct_broker_helpers:delete_user(Config, Username2),
141143
?awaitMatch(0, length(all_connections(Config)), ?AWAIT_TIMEOUT).
142144

143145
single_node_user_deletion_forces_connection_closure(Config) ->
144-
Username = proplists:get_value(rmq_username, Config),
145-
Username2 = <<"guest2">>,
146+
Username1 = list_to_binary(atom_to_list(?FUNCTION_NAME) ++ "-1"),
147+
Username2 = list_to_binary(atom_to_list(?FUNCTION_NAME) ++ "-2"),
146148

147149
Vhost = proplists:get_value(rmq_vhost, Config),
148150

149-
rabbit_ct_broker_helpers:add_user(Config, Username2),
150-
rabbit_ct_broker_helpers:set_full_permissions(Config, Username2, Vhost),
151+
[ begin
152+
rabbit_ct_broker_helpers:add_user(Config, U),
153+
rabbit_ct_broker_helpers:set_full_permissions(Config, U, Vhost)
154+
end || U <- [Username1, Username2]],
151155

152-
?assertEqual(0, count_connections_in(Config, Username)),
156+
?assertEqual(0, count_connections_in(Config, Username1)),
153157
?assertEqual(0, count_connections_in(Config, Username2)),
154158

155-
[Conn1] = open_connections(Config, [0]),
156-
?awaitMatch(1, count_connections_in(Config, Username), ?AWAIT_TIMEOUT),
159+
[Conn1] = open_connections(Config, [{0, Username1}]),
160+
?awaitMatch(1, count_connections_in(Config, Username1), ?AWAIT_TIMEOUT),
157161

158162
[_Conn2] = open_connections(Config, [{0, Username2}]),
159163
?awaitMatch(1, count_connections_in(Config, Username2), ?AWAIT_TIMEOUT),
@@ -162,22 +166,24 @@ single_node_user_deletion_forces_connection_closure(Config) ->
162166
?awaitMatch(0, count_connections_in(Config, Username2), ?AWAIT_TIMEOUT),
163167

164168
close_connections([Conn1]),
165-
?awaitMatch(0, count_connections_in(Config, Username), ?AWAIT_TIMEOUT).
169+
?awaitMatch(0, count_connections_in(Config, Username1), ?AWAIT_TIMEOUT).
166170

167171
cluster_user_deletion_forces_connection_closure(Config) ->
168-
Username = proplists:get_value(rmq_username, Config),
169-
Username2 = <<"guest2">>,
172+
Username1 = list_to_binary(atom_to_list(?FUNCTION_NAME) ++ "-1"),
173+
Username2 = list_to_binary(atom_to_list(?FUNCTION_NAME) ++ "-2"),
170174

171175
Vhost = proplists:get_value(rmq_vhost, Config),
172176

173-
rabbit_ct_broker_helpers:add_user(Config, Username2),
174-
rabbit_ct_broker_helpers:set_full_permissions(Config, Username2, Vhost),
177+
[ begin
178+
rabbit_ct_broker_helpers:add_user(Config, U),
179+
rabbit_ct_broker_helpers:set_full_permissions(Config, U, Vhost)
180+
end || U <- [Username1, Username2]],
175181

176-
?assertEqual(0, count_connections_in(Config, Username)),
182+
?assertEqual(0, count_connections_in(Config, Username1)),
177183
?assertEqual(0, count_connections_in(Config, Username2)),
178184

179-
[Conn1] = open_connections(Config, [{0, Username}]),
180-
?awaitMatch(1, count_connections_in(Config, Username), ?AWAIT_TIMEOUT),
185+
[Conn1] = open_connections(Config, [{0, Username1}]),
186+
?awaitMatch(1, count_connections_in(Config, Username1), ?AWAIT_TIMEOUT),
181187

182188
[_Conn2] = open_connections(Config, [{1, Username2}]),
183189
?awaitMatch(1, count_connections_in(Config, Username2), ?AWAIT_TIMEOUT),
@@ -186,7 +192,7 @@ cluster_user_deletion_forces_connection_closure(Config) ->
186192
?awaitMatch(0, count_connections_in(Config, Username2), ?AWAIT_TIMEOUT),
187193

188194
close_connections([Conn1]),
189-
?awaitMatch(0, count_connections_in(Config, Username), ?AWAIT_TIMEOUT).
195+
?awaitMatch(0, count_connections_in(Config, Username1), ?AWAIT_TIMEOUT).
190196

191197
%% -------------------------------------------------------------------
192198
%% Helpers

0 commit comments

Comments
 (0)