yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #13395 from thalesmg/20240702-r57-test-flaky-cluster-invite-timeout 

test: attempt to fix flaky tests
This commit is contained in:
Thales Macedo Garitezi 2024-07-03 09:32:58 -03:00 committed by GitHub
parent fe256363ad b0c0c02df9
commit 2c3209e258
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
apps/emqx_management/test/emqx_mgmt_api_cluster_SUITE.erl
View File

@ -78,19 +78,26 @@ t_cluster_topology_api_replicants(Config) ->
[ [
#{ #{
core_node := Core1, core_node := Core1,
replicant_nodes := replicant_nodes := _
[#{node := Replicant, streams := _}]
}, },
#{ #{
core_node := Core2, core_node := Core2,
replicant_nodes := replicant_nodes := _
[#{node := Replicant, streams := _}]
} }
], ],
Resp Resp
) )
|| Resp <- [lists:sort(R) || R <- [Core1Resp, Core2Resp, ReplResp]] || Resp <- [lists:sort(R) || R <- [Core1Resp, Core2Resp, ReplResp]]
]. ],
%% Occasionally, the replicant may decide to not connect to one core (seen at tests)...
Core1RespReplicants = lists:usort([
Rep
|| R <- [Core1Resp, Core2Resp, ReplResp],
#{replicant_nodes := Reps} <- R,
#{node := Rep} <- Reps
]),
?assertMatch([Replicant], Core1RespReplicants),
ok.
t_cluster_invite_api_timeout(Config) -> t_cluster_invite_api_timeout(Config) ->
%% assert the cluster is created %% assert the cluster is created
@ -100,17 +107,22 @@ t_cluster_invite_api_timeout(Config) ->
[ [
#{ #{
core_node := Core1, core_node := Core1,
replicant_nodes := replicant_nodes := _
[#{node := Replicant, streams := _}]
}, },
#{ #{
core_node := Core2, core_node := Core2,
replicant_nodes := replicant_nodes := _
[#{node := Replicant, streams := _}]
} }
], ],
lists:sort(Core1Resp) lists:sort(Core1Resp)
), ),
%% Occasionally, the replicant may decide to connect to one core (seen at tests)...
Core1RespReplicants = lists:usort([
Rep
|| #{replicant_nodes := Reps} <- Core1Resp,
#{node := Rep} <- Reps
]),
?assertMatch([Replicant], Core1RespReplicants),
%% force leave the core2 %% force leave the core2
{204} = rpc:call( {204} = rpc:call(
@ -181,17 +193,22 @@ t_cluster_invite_async(Config) ->
[ [
#{ #{
core_node := Core1, core_node := Core1,
replicant_nodes := replicant_nodes := _
[#{node := Replicant, streams := _}]
}, },
#{ #{
core_node := Core2, core_node := Core2,
replicant_nodes := replicant_nodes := _
[#{node := Replicant, streams := _}]
} }
], ],
lists:sort(Core1Resp) lists:sort(Core1Resp)
), ),
%% Occasionally, the replicant may decide to connect to one core (seen at tests)...
Core1RespReplicants = lists:usort([
Rep
|| #{replicant_nodes := Reps} <- Core1Resp,
#{node := Rep} <- Reps
]),
?assertMatch([Replicant], Core1RespReplicants),
%% force leave the core2 %% force leave the core2
{204} = rpc:call( {204} = rpc:call(
@ -206,7 +223,7 @@ t_cluster_invite_async(Config) ->
[ [
#{ #{
core_node := Core1, core_node := Core1,
replicant_nodes := [_] replicant_nodes := _
} }
], ],
lists:sort(Core1Resp2) lists:sort(Core1Resp2)