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

test: fix false one-view check

This commit is contained in:
Zaiming (Stone) Shi 2022-10-03 09:19:26 +02:00
parent c63b8e79d3
commit 402553b95a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/emqx_node_helpers.erl
View File

@ -100,10 +100,10 @@ do_wait_for_synced_routes(Nodes, Topic) ->
PerNodeView = lists:keysort(1, PerNodeView0), PerNodeView = lists:keysort(1, PerNodeView0),
case check_consistent_view(PerNodeView) of case check_consistent_view(PerNodeView) of
{ok, OneView} -> {ok, OneView} ->
io:format(user, "~p~n", [OneView]), ct:pal(user, "consistent_routes_view~n~p", [OneView]),
ok; ok;
{error, Reason}-> {error, Reason}->
ct:pal("inconsistent_routes_view ~p", [Reason]), ct:pal(user, "inconsistent_routes_view~n~p", [Reason]),
timer:sleep(10), timer:sleep(10),
do_wait_for_synced_routes(Nodes, Topic) do_wait_for_synced_routes(Nodes, Topic)
end. end.
@ -111,7 +111,8 @@ do_wait_for_synced_routes(Nodes, Topic) ->
check_consistent_view(PerNodeView) -> check_consistent_view(PerNodeView) ->
check_consistent_view(PerNodeView, []). check_consistent_view(PerNodeView, []).
check_consistent_view([], Acc) -> {ok, Acc}; check_consistent_view([], [OneView]) -> {ok, OneView};
check_consistent_view([], MoreThanOneView) -> {error, MoreThanOneView};
check_consistent_view([{View, Node} | Rest], [{View, Nodes} | Acc]) -> check_consistent_view([{View, Node} | Rest], [{View, Nodes} | Acc]) ->
check_consistent_view(Rest, [{View, add_to_list(Node, Nodes)} | Acc]); check_consistent_view(Rest, [{View, add_to_list(Node, Nodes)} | Acc]);
check_consistent_view([{View, Node} | Rest], Acc) -> check_consistent_view([{View, Node} | Rest], Acc) ->