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

fix(test): race condition in emqx_telemetry_SUITE

This commit is contained in:
Shawn 2022-04-29 14:40:20 +08:00
parent 344a754674
commit 1393ab677d
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
apps/emqx_modules/test/emqx_telemetry_SUITE.erl
View File

@ -140,9 +140,16 @@ init_per_testcase(t_exhook_info, Config) ->
} }
}, },
{ok, _} = emqx_exhook_demo_svr:start(), {ok, _} = emqx_exhook_demo_svr:start(),
timer:sleep(2000),
{ok, Sock} = gen_tcp:connect("localhost", 9000, [], 3000),
_ = gen_tcp:close(Sock),
ok = emqx_common_test_helpers:load_config(emqx_exhook_schema, ExhookConf), ok = emqx_common_test_helpers:load_config(emqx_exhook_schema, ExhookConf),
{ok, _} = application:ensure_all_started(emqx_exhook), {ok, _} = application:ensure_all_started(emqx_exhook),
Config; Config;
init_per_testcase(t_cluster_uuid, Config) ->
Node = start_slave(n1),
ok = setup_slave(Node),
[{n1, Node} | Config];
init_per_testcase(_Testcase, Config) -> init_per_testcase(_Testcase, Config) ->
mock_httpc(), mock_httpc(),
Config. Config.
@ -188,6 +195,9 @@ end_per_testcase(t_exhook_info, _Config) ->
emqx_exhook_demo_svr:stop(), emqx_exhook_demo_svr:stop(),
application:stop(emqx_exhook), application:stop(emqx_exhook),
ok; ok;
end_per_testcase(t_cluster_uuid, Config) ->
Node = proplists:get_value(n1, Config),
ok = stop_slave(Node);
end_per_testcase(_Testcase, _Config) -> end_per_testcase(_Testcase, _Config) ->
meck:unload([httpc]), meck:unload([httpc]),
ok. ok.
@ -211,23 +221,16 @@ t_node_uuid(_) ->
?assertEqual(NodeUUID3, NodeUUID4), ?assertEqual(NodeUUID3, NodeUUID4),
?assertMatch({badrpc, nodedown}, emqx_telemetry_proto_v1:get_node_uuid('fake@node')). ?assertMatch({badrpc, nodedown}, emqx_telemetry_proto_v1:get_node_uuid('fake@node')).
t_cluster_uuid(_Config) -> t_cluster_uuid(Config) ->
Node = proplists:get_value(n1, Config),
{ok, ClusterUUID0} = emqx_telemetry:get_cluster_uuid(), {ok, ClusterUUID0} = emqx_telemetry:get_cluster_uuid(),
{ok, ClusterUUID1} = emqx_telemetry_proto_v1:get_cluster_uuid(node()), {ok, ClusterUUID1} = emqx_telemetry_proto_v1:get_cluster_uuid(node()),
?assertEqual(ClusterUUID0, ClusterUUID1), ?assertEqual(ClusterUUID0, ClusterUUID1),
{ok, NodeUUID0} = emqx_telemetry:get_node_uuid(), {ok, NodeUUID0} = emqx_telemetry:get_node_uuid(),
{ok, ClusterUUID2} = emqx_telemetry_proto_v1:get_cluster_uuid(Node),
Node = start_slave(n1), ?assertEqual(ClusterUUID0, ClusterUUID2),
try {ok, NodeUUID1} = emqx_telemetry_proto_v1:get_node_uuid(Node),
ok = setup_slave(Node), ?assertNotEqual(NodeUUID0, NodeUUID1),
{ok, ClusterUUID2} = emqx_telemetry_proto_v1:get_cluster_uuid(Node),
?assertEqual(ClusterUUID0, ClusterUUID2),
{ok, NodeUUID1} = emqx_telemetry_proto_v1:get_node_uuid(Node),
?assertNotEqual(NodeUUID0, NodeUUID1),
ok
after
ok = stop_slave(Node)
end,
ok. ok.
t_official_version(_) -> t_official_version(_) ->