From 84f241522f86bccccaf682f2a861ba65f7e9e432 Mon Sep 17 00:00:00 2001 From: Gilbert Wong Date: Wed, 29 Aug 2018 14:36:40 +0800 Subject: [PATCH] update frame suite and frame suite --- Makefile | 8 +++++--- test/emqx_frame_SUITE.erl | 10 ++++++---- test/emqx_router_SUITE.erl | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 85f22a60f..478724e66 100644 --- a/Makefile +++ b/Makefile @@ -32,11 +32,13 @@ TEST_ERLC_OPTS += +'{parse_transform, lager_transform}' EUNIT_OPTS = verbose -CT_SUITES = emqx_stats +# CT_SUITES = emqx_stats ## emqx_trie emqx_router emqx_frame emqx_mqtt_compat -#CT_SUITES = emqx emqx_broker emqx_mod emqx_lib emqx_topic emqx_mqueue emqx_inflight \ -# emqx_vm emqx_net emqx_protocol emqx_access emqx_router +CT_SUITES = emqx emqx_access emqx_base62 emqx_broker emqx_client emqx_cm emqx_frame emqx_guid emqx_inflight \ + emqx_json emqx_keepalive emqx_lib emqx_metrics emqx_misc emqx_mod emqx_mqtt_caps \ + emqx_mqtt_compat emqx_mqtt_properties emqx_mqueue emqx_net emqx_pqueue emqx_router emqx_sm \ + emqx_stats emqx_tables emqx_time emqx_topic emqx_trie emqx_vm emqx_zone CT_OPTS = -cover test/ct.cover.spec -erl_args -name emqxct@127.0.0.1 diff --git a/test/emqx_frame_SUITE.erl b/test/emqx_frame_SUITE.erl index b24644cd3..60ed52e46 100644 --- a/test/emqx_frame_SUITE.erl +++ b/test/emqx_frame_SUITE.erl @@ -329,15 +329,17 @@ serialize_parse_pubcomp_v5(_) -> serialize_parse_subscribe(_) -> %% SUBSCRIBE(Q1, R0, D0, PacketId=2, TopicTable=[{<<"TopicA">>,2}]) Bin = <<130,11,0,2,0,6,84,111,112,105,99,65,2>>, - TopicFilters = [{<<"TopicA">>, #{qos => 2}}], + TopicOpts = #{ nl => 0 , rap => 0, rc => 0, + rh => 0, subid => 0 , qos => 2 }, + TopicFilters = [{<<"TopicA">>, TopicOpts}], Packet = ?SUBSCRIBE_PACKET(2, TopicFilters), ?assertEqual(Bin, iolist_to_binary(serialize(Packet))), ?assertEqual({ok, Packet, <<>>}, parse(Bin)). serialize_parse_subscribe_v5(_) -> - TopicFilters = [{<<"TopicQos0">>, #{rh => 1, qos => ?QOS_0}}, - {<<"TopicQos1">>, #{rh => 1, qos => ?QOS_1}}], - Packet = ?SUBSCRIBE_PACKET(1, #{'Subscription-Identifier' => 16#FFFFFFF}, + TopicFilters = [{<<"TopicQos0">>, #{rh => 1, qos => ?QOS_2, rap => 0, nl => 0, rc => 0, subid => 0}}, + {<<"TopicQos1">>, #{rh => 1, qos => ?QOS_2, rap => 0, nl => 0, rc => 0, subid => 0}}], + Packet = ?SUBSCRIBE_PACKET(3, #{'Subscription-Identifier' => 16#FFFFFFF}, TopicFilters), ?assertEqual({ok, Packet, <<>>}, parse_serialize(Packet, #{version => ?MQTT_PROTO_V5})). diff --git a/test/emqx_router_SUITE.erl b/test/emqx_router_SUITE.erl index f44039a08..b9d40810a 100644 --- a/test/emqx_router_SUITE.erl +++ b/test/emqx_router_SUITE.erl @@ -70,7 +70,7 @@ match_routes(_) -> ?R:add_route(From, <<"a/+/c">>, node()), ?R:add_route(From, <<"a/b/#">>, node()), ?R:add_route(From, <<"#">>, node()), - timer:sleep(6), + timer:sleep(1000), ?assertEqual([#route{topic = <<"#">>, dest = node()}, #route{topic = <<"a/+/c">>, dest = node()}, #route{topic = <<"a/b/#">>, dest = node()},