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

Merge pull request #3240 from emqx/master 

Receive for the EXIT message on test cases
This commit is contained in:
turtleDeng 2020-02-07 17:08:59 +08:00 committed by GitHub
parent fe94acffec a6a385b26a
commit 43c29c5330
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
test/mqtt_protocol_v5_SUITE.erl
View File

@ -340,6 +340,10 @@ t_connect_will_delay_interval(_) ->
?assertEqual(1, length(receive_messages(1))), ?assertEqual(1, length(receive_messages(1))),
ok = emqtt:disconnect(Client1), ok = emqtt:disconnect(Client1),
receive {'EXIT', _, _} -> ok
after 100 -> ok
end,
process_flag(trap_exit, false). process_flag(trap_exit, false).
%% [MQTT-3.1.4-3] %% [MQTT-3.1.4-3]
@ -451,6 +455,9 @@ t_connack_max_qos_allowed(_) ->
?assertEqual(2, maps:get('Maximum-QoS',Connack5)), %% [MQTT-3.2.2-9] ?assertEqual(2, maps:get('Maximum-QoS',Connack5)), %% [MQTT-3.2.2-9]
ok = emqtt:disconnect(Client5), ok = emqtt:disconnect(Client5),
receive {'EXIT', _, _} -> ok
after 100 -> ok
end,
process_flag(trap_exit, false). process_flag(trap_exit, false).
t_connack_assigned_clienid(_) -> t_connack_assigned_clienid(_) ->
@ -493,6 +500,9 @@ t_publish_wildtopic(_) ->
ok = emqtt:publish(Client1, Topic, <<"error topic">>), ok = emqtt:publish(Client1, Topic, <<"error topic">>),
?assertEqual(144, receive_disconnect_reasoncode()), ?assertEqual(144, receive_disconnect_reasoncode()),
receive {'EXIT', _, _} -> ok
after 100 -> ok
end,
process_flag(trap_exit, false). process_flag(trap_exit, false).
t_publish_payload_format_indicator(_) -> t_publish_payload_format_indicator(_) ->
@ -523,6 +533,10 @@ t_publish_topic_alias(_) ->
ok = emqtt:publish(Client2, <<"">>, #{'Topic-Alias' => 233}, <<"Topic-Alias">>, [{qos, ?QOS_0}]), ok = emqtt:publish(Client2, <<"">>, #{'Topic-Alias' => 233}, <<"Topic-Alias">>, [{qos, ?QOS_0}]),
?assertEqual(2, length(receive_messages(2))), %% [MQTT-3.3.2-12] ?assertEqual(2, length(receive_messages(2))), %% [MQTT-3.3.2-12]
ok = emqtt:disconnect(Client2), ok = emqtt:disconnect(Client2),
receive {'EXIT', _, _} -> ok
after 100 -> ok
end,
process_flag(trap_exit, false). process_flag(trap_exit, false).
t_publish_response_topic(_) -> t_publish_response_topic(_) ->
@ -534,6 +548,9 @@ t_publish_response_topic(_) ->
ok = emqtt:publish(Client1, Topic, #{'Response-Topic' => nth(1, ?WILD_TOPICS)}, <<"Response-Topic">>, [{qos, ?QOS_0}]), ok = emqtt:publish(Client1, Topic, #{'Response-Topic' => nth(1, ?WILD_TOPICS)}, <<"Response-Topic">>, [{qos, ?QOS_0}]),
?assertEqual(130, receive_disconnect_reasoncode()), %% [MQTT-3.3.2-14] ?assertEqual(130, receive_disconnect_reasoncode()), %% [MQTT-3.3.2-14]
receive {'EXIT', _, _} -> ok
after 100 -> ok
end,
process_flag(trap_exit, false). process_flag(trap_exit, false).
t_publish_properties(_) -> t_publish_properties(_) ->