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

test: fix expected connector name after name convention generation changed

This commit is contained in:
Thales Macedo Garitezi 2023-12-20 13:10:50 -03:00
parent 7fc069da46
commit 862283ff7c
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/emqx_bridge_gcp_pubsub/test/emqx_bridge_gcp_pubsub_producer_SUITE.erl
View File

@ -159,7 +159,7 @@ generate_config(Config0) ->
} = gcp_pubsub_config(Config0), } = gcp_pubsub_config(Config0),
%% FIXME %% FIXME
%% `emqx_bridge_resource:resource_id' requires an existing connector in the config..... %% `emqx_bridge_resource:resource_id' requires an existing connector in the config.....
ConnectorName = <<"connector_", ActionName/binary>>, ConnectorName = ActionName,
ConnectorResourceId = <<"connector:", ?CONNECTOR_TYPE_BIN/binary, ":", ConnectorName/binary>>, ConnectorResourceId = <<"connector:", ?CONNECTOR_TYPE_BIN/binary, ":", ConnectorName/binary>>,
ActionResourceId = emqx_bridge_v2:id(?ACTION_TYPE_BIN, ActionName, ConnectorName), ActionResourceId = emqx_bridge_v2:id(?ACTION_TYPE_BIN, ActionName, ConnectorName),
BridgeId = emqx_bridge_resource:bridge_id(?BRIDGE_V1_TYPE_BIN, ActionName), BridgeId = emqx_bridge_resource:bridge_id(?BRIDGE_V1_TYPE_BIN, ActionName),
@ -1228,7 +1228,11 @@ do_econnrefused_or_timeout_test(Config, Error) ->
%% _Msg = "The connection was lost." %% _Msg = "The connection was lost."
ok; ok;
Trace0 -> Trace0 ->
error({unexpected_trace, Trace0}) error(
{unexpected_trace, Trace0, #{
expected_connector_id => ConnectorResourceId
}}
)
end; end;
timeout -> timeout ->
?assertMatch( ?assertMatch(

4
apps/emqx_management/test/emqx_mgmt_api_configs_SUITE.erl
View File

@ -412,7 +412,7 @@ t_create_webhook_v1_bridges_api(Config) ->
#{ #{
<<"webhook_name">> => <<"webhook_name">> =>
#{ #{
<<"connector">> => <<"connector_webhook_name">>, <<"connector">> => <<"webhook_name">>,
<<"description">> => <<>>, <<"description">> => <<>>,
<<"enable">> => true, <<"enable">> => true,
<<"parameters">> => <<"parameters">> =>
@ -440,7 +440,7 @@ t_create_webhook_v1_bridges_api(Config) ->
#{ #{
<<"http">> => <<"http">> =>
#{ #{
<<"connector_webhook_name">> => <<"webhook_name">> =>
#{ #{
<<"connect_timeout">> => <<"15s">>, <<"connect_timeout">> => <<"15s">>,
<<"description">> => <<>>, <<"description">> => <<>>,