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

test(emqx_bridge_v2_api_SUITE): fix cluster test

This commit is contained in:
Kjell Winblad 2023-11-03 11:11:27 +01:00
parent d14d0fbcb1
commit ebb5997a8c
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
apps/emqx_bridge/test/emqx_bridge_v2_api_SUITE.erl
View File

@ -147,6 +147,7 @@
emqx, emqx,
emqx_auth, emqx_auth,
emqx_management, emqx_management,
emqx_connector,
{emqx_bridge, "bridges_v2 {}"}, {emqx_bridge, "bridges_v2 {}"},
{emqx_rule_engine, "rule_engine { rules {} }"} {emqx_rule_engine, "rule_engine { rules {} }"}
]). ]).
@ -508,23 +509,29 @@ do_start_bridge(TestType, Config) ->
{ok, 400, _} = request(post, {operation, TestType, invalidop, BridgeID}, Config), {ok, 400, _} = request(post, {operation, TestType, invalidop, BridgeID}, Config),
%% Make start bridge fail %% Make start bridge fail
ok = meck:expect( expect_on_all_nodes(
?CONNECTOR_IMPL, ?CONNECTOR_IMPL,
on_add_channel, on_add_channel,
fun(_, _, _ResId, _Channel) -> {error, <<"my_error">>} end fun(_, _, _ResId, _Channel) -> {error, <<"my_error">>} end,
Config
),
ConnectorID = emqx_connector_resource:connector_id(?BRIDGE_TYPE, ?CONNECTOR_NAME),
{ok, 204, <<>>} = emqx_connector_api_SUITE:request(
post, {operation, TestType, stop, ConnectorID}, Config
),
{ok, 204, <<>>} = emqx_connector_api_SUITE:request(
post, {operation, TestType, start, ConnectorID}, Config
), ),
ok = emqx_connector_resource:stop(?BRIDGE_TYPE, ?CONNECTOR_NAME),
ok = emqx_connector_resource:start(?BRIDGE_TYPE, ?CONNECTOR_NAME),
{ok, 400, _} = request(post, {operation, TestType, start, BridgeID}, Config), {ok, 400, _} = request(post, {operation, TestType, start, BridgeID}, Config),
%% Make start bridge succeed %% Make start bridge succeed
ok = meck:expect( expect_on_all_nodes(
?CONNECTOR_IMPL, ?CONNECTOR_IMPL,
on_add_channel, on_add_channel,
fun(_, _, _ResId, _Channel) -> {ok, connector_state} end fun(_, _, _ResId, _Channel) -> {ok, connector_state} end,
Config
), ),
%% try to start again %% try to start again
@ -540,6 +547,15 @@ do_start_bridge(TestType, Config) ->
{ok, 404, _} = request(post, {operation, TestType, start, <<"webhook:cptn_hook">>}, Config), {ok, 404, _} = request(post, {operation, TestType, start, <<"webhook:cptn_hook">>}, Config),
ok. ok.
expect_on_all_nodes(Mod, Function, Fun, Config) ->
case ?config(cluster_nodes, Config) of
undefined ->
ok = meck:expect(Mod, Function, Fun);
Nodes ->
[erpc:call(Node, meck, expect, [Mod, Function, Fun]) || Node <- Nodes]
end,
ok.
%% t_start_stop_inconsistent_bridge_node(Config) -> %% t_start_stop_inconsistent_bridge_node(Config) ->
%% start_stop_inconsistent_bridge(node, Config). %% start_stop_inconsistent_bridge(node, Config).