From 8b0a6d955b202059b2046b75e79a9fa69115e6b1 Mon Sep 17 00:00:00 2001 From: Shawn <506895667@qq.com> Date: Wed, 16 Jun 2021 10:37:11 +0800 Subject: [PATCH] fix(test): ci failed due to existing subscriptions --- apps/emqx/test/emqx_broker_SUITE.erl | 30 ++++++++++++++-------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/apps/emqx/test/emqx_broker_SUITE.erl b/apps/emqx/test/emqx_broker_SUITE.erl index 3313d79a5..d6fa36c18 100644 --- a/apps/emqx/test/emqx_broker_SUITE.erl +++ b/apps/emqx/test/emqx_broker_SUITE.erl @@ -41,6 +41,21 @@ end_per_suite(_Config) -> %% PubSub Test %%-------------------------------------------------------------------- +t_stats_fun(_) -> + ?assertEqual(0, emqx_stats:getstat('subscribers.count')), + ?assertEqual(0, emqx_stats:getstat('subscriptions.count')), + ?assertEqual(0, emqx_stats:getstat('suboptions.count')), + ok = emqx_broker:subscribe(<<"topic">>, <<"clientid">>), + ok = emqx_broker:subscribe(<<"topic2">>, <<"clientid">>), + emqx_broker:stats_fun(), + ct:sleep(10), + ?assertEqual(2, emqx_stats:getstat('subscribers.count')), + ?assertEqual(2, emqx_stats:getstat('subscribers.max')), + ?assertEqual(2, emqx_stats:getstat('subscriptions.count')), + ?assertEqual(2, emqx_stats:getstat('subscriptions.max')), + ?assertEqual(2, emqx_stats:getstat('suboptions.count')), + ?assertEqual(2, emqx_stats:getstat('suboptions.max')). + t_subscribed(_) -> emqx_broker:subscribe(<<"topic">>), ?assertEqual(false, emqx_broker:subscribed(undefined, <<"topic">>)), @@ -191,21 +206,6 @@ t_shard(_) -> end), ok = meck:unload(emqx_broker_helper). -t_stats_fun(_) -> - ?assertEqual(0, emqx_stats:getstat('subscribers.count')), - ?assertEqual(0, emqx_stats:getstat('subscriptions.count')), - ?assertEqual(0, emqx_stats:getstat('suboptions.count')), - ok = emqx_broker:subscribe(<<"topic">>, <<"clientid">>), - ok = emqx_broker:subscribe(<<"topic2">>, <<"clientid">>), - emqx_broker:stats_fun(), - ct:sleep(10), - ?assertEqual(2, emqx_stats:getstat('subscribers.count')), - ?assertEqual(2, emqx_stats:getstat('subscribers.max')), - ?assertEqual(2, emqx_stats:getstat('subscriptions.count')), - ?assertEqual(2, emqx_stats:getstat('subscriptions.max')), - ?assertEqual(2, emqx_stats:getstat('suboptions.count')), - ?assertEqual(2, emqx_stats:getstat('suboptions.max')). - recv_msgs(Count) -> recv_msgs(Count, []).