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

test: fix SUITE case `t_create_disconnected/1`

This commit is contained in:
JimMoen 2023-04-11 04:39:15 +08:00
parent d7ad07f1dc
commit 437096985b
No known key found for this signature in database
GPG Key ID: 87A520B4F76BA86D
1 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_sqlserver_SUITE.erl
View File

@ -224,22 +224,9 @@ t_get_status(Config) ->
ProxyHost = ?config(proxy_host, Config), ProxyHost = ?config(proxy_host, Config),
ProxyName = ?config(proxy_name, Config), ProxyName = ?config(proxy_name, Config),
Name = ?config(sqlserver_name, Config), health_check_resource_ok(Config),
BridgeType = ?config(sqlserver_bridge_type, Config),
ResourceID = emqx_bridge_resource:resource_id(BridgeType, Name),
?assertEqual({ok, connected}, emqx_resource_manager:health_check(ResourceID)),
emqx_common_test_helpers:with_failure(down, ProxyName, ProxyHost, ProxyPort, fun() -> emqx_common_test_helpers:with_failure(down, ProxyName, ProxyHost, ProxyPort, fun() ->
case emqx_resource_manager:health_check(ResourceID) of health_check_resource_down(Config)
{ok, Status} when Status =:= disconnected orelse Status =:= connecting ->
ok;
{error, timeout} ->
ok;
Other ->
?assert(
false, lists:flatten(io_lib:format("invalid health check result:~p~n", [Other]))
)
end
end), end),
ok. ok.
@ -247,18 +234,11 @@ t_create_disconnected(Config) ->
ProxyPort = ?config(proxy_port, Config), ProxyPort = ?config(proxy_port, Config),
ProxyHost = ?config(proxy_host, Config), ProxyHost = ?config(proxy_host, Config),
ProxyName = ?config(proxy_name, Config), ProxyName = ?config(proxy_name, Config),
?check_trace( emqx_common_test_helpers:with_failure(down, ProxyName, ProxyHost, ProxyPort, fun() ->
emqx_common_test_helpers:with_failure(down, ProxyName, ProxyHost, ProxyPort, fun() -> ?assertMatch({ok, _}, create_bridge(Config)),
?assertMatch({ok, _}, create_bridge(Config)) health_check_resource_down(Config)
end), end),
fun(Trace) -> health_check_resource_ok(Config),
?assertMatch(
[#{error := {start_pool_failed, _, _}}],
?of_kind(sqlserver_connector_start_failed, Trace)
),
ok
end
),
ok. ok.
t_write_failure(Config) -> t_write_failure(Config) ->
@ -522,6 +502,26 @@ query_resource_async(Config, Request) ->
}), }),
{Return, Ref}. {Return, Ref}.
resource_id(Config) ->
Name = ?config(sqlserver_name, Config),
BridgeType = ?config(sqlserver_bridge_type, Config),
_ResourceID = emqx_bridge_resource:resource_id(BridgeType, Name).
health_check_resource_ok(Config) ->
?assertEqual({ok, connected}, emqx_resource_manager:health_check(resource_id(Config))).
health_check_resource_down(Config) ->
case emqx_resource_manager:health_check(resource_id(Config)) of
{ok, Status} when Status =:= disconnected orelse Status =:= connecting ->
ok;
{error, timeout} ->
ok;
Other ->
?assert(
false, lists:flatten(io_lib:format("invalid health check result:~p~n", [Other]))
)
end.
receive_result(Ref, Timeout) -> receive_result(Ref, Timeout) ->
receive receive
{result, Ref, Result} -> {result, Ref, Result} ->