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

test: fix failed tests

This commit is contained in:
JianBo He 2022-09-01 11:28:38 +08:00
parent a5ac5b6f3a
commit c1afb34a86
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/emqx/test/emqx_mqtt_SUITE.erl
View File

@ -115,7 +115,7 @@ message_expiry_interval_init() ->
message_expiry_interval_exipred(CPublish, CControl, QoS) -> message_expiry_interval_exipred(CPublish, CControl, QoS) ->
ct:pal("~p ~p", [?FUNCTION_NAME, QoS]), ct:pal("~p ~p", [?FUNCTION_NAME, QoS]),
%% publish to t/a and waiting for the message expired %% publish to t/a and waiting for the message expired
emqtt:publish( _ = emqtt:publish(
CPublish, CPublish,
<<"t/a">>, <<"t/a">>,
#{'Message-Expiry-Interval' => 1}, #{'Message-Expiry-Interval' => 1},
@ -152,7 +152,7 @@ message_expiry_interval_exipred(CPublish, CControl, QoS) ->
message_expiry_interval_not_exipred(CPublish, CControl, QoS) -> message_expiry_interval_not_exipred(CPublish, CControl, QoS) ->
ct:pal("~p ~p", [?FUNCTION_NAME, QoS]), ct:pal("~p ~p", [?FUNCTION_NAME, QoS]),
%% publish to t/a %% publish to t/a
emqtt:publish( _ = emqtt:publish(
CPublish, CPublish,
<<"t/a">>, <<"t/a">>,
#{'Message-Expiry-Interval' => 20}, #{'Message-Expiry-Interval' => 20},

10
apps/emqx/test/emqx_mqtt_protocol_v5_SUITE.erl
View File

@ -529,8 +529,11 @@ t_connack_max_qos_allowed(Config) ->
%% [MQTT-3.2.2-10] %% [MQTT-3.2.2-10]
{ok, _, [2]} = emqtt:subscribe(Client1, Topic, 2), {ok, _, [2]} = emqtt:subscribe(Client1, Topic, 2),
{ok, _} = emqtt:publish(Client1, Topic, <<"Unsupported Qos 1">>, qos1),
%% [MQTT-3.2.2-11] %% [MQTT-3.2.2-11]
?assertMatch(
{error, {disconnected, 155, _}},
emqtt:publish(Client1, Topic, <<"Unsupported Qos 1">>, qos1)
),
?assertEqual(155, receive_disconnect_reasoncode()), ?assertEqual(155, receive_disconnect_reasoncode()),
waiting_client_process_exit(Client1), waiting_client_process_exit(Client1),
@ -563,8 +566,11 @@ t_connack_max_qos_allowed(Config) ->
%% [MQTT-3.2.2-10] %% [MQTT-3.2.2-10]
{ok, _, [2]} = emqtt:subscribe(Client3, Topic, 2), {ok, _, [2]} = emqtt:subscribe(Client3, Topic, 2),
{ok, _} = emqtt:publish(Client3, Topic, <<"Unsupported Qos 2">>, qos2),
%% [MQTT-3.2.2-11] %% [MQTT-3.2.2-11]
?assertMatch(
{error, {disconnected, 155, _}},
emqtt:publish(Client3, Topic, <<"Unsupported Qos 2">>, qos2)
),
?assertEqual(155, receive_disconnect_reasoncode()), ?assertEqual(155, receive_disconnect_reasoncode()),
waiting_client_process_exit(Client3), waiting_client_process_exit(Client3),

7
apps/emqx_bridge/src/emqx_bridge_api.erl
View File

@ -20,7 +20,6 @@
-include_lib("typerefl/include/types.hrl"). -include_lib("typerefl/include/types.hrl").
-include_lib("hocon/include/hoconsc.hrl"). -include_lib("hocon/include/hoconsc.hrl").
-include_lib("emqx/include/logger.hrl"). -include_lib("emqx/include/logger.hrl").
-include_lib("emqx_resource/include/emqx_resource.hrl").
-include_lib("emqx_bridge/include/emqx_bridge.hrl"). -include_lib("emqx_bridge/include/emqx_bridge.hrl").
-import(hoconsc, [mk/2, array/1, enum/1]). -import(hoconsc, [mk/2, array/1, enum/1]).
@ -232,11 +231,11 @@ mqtt_main_example() ->
retry_interval => <<"15s">>, retry_interval => <<"15s">>,
max_inflight => 100, max_inflight => 100,
resource_opts => #{ resource_opts => #{
health_check_interval => ?HEALTHCHECK_INTERVAL_RAW, health_check_interval => <<"15s">>,
auto_restart_interval => ?AUTO_RESTART_INTERVAL_RAW, auto_restart_interval => <<"60s">>,
query_mode => sync, query_mode => sync,
enable_queue => false, enable_queue => false,
max_queue_bytes => ?DEFAULT_QUEUE_SIZE max_queue_bytes => 100 * 1024 * 1024
}, },
ssl => #{ ssl => #{
enable => false enable => false