diff --git a/test/emqx_SUITE.erl b/test/emqx_SUITE.erl index 563683bf1..0a6ef4d0a 100644 --- a/test/emqx_SUITE.erl +++ b/test/emqx_SUITE.erl @@ -43,7 +43,7 @@ t_get_env(_) -> t_emqx_pubsub_api(_) -> emqx:start(), true = emqx:is_running(node()), - {ok, C} = emqtt:start_link([{host, "localhost"}, {client_id, "myclient"}]), + {ok, C} = emqtt:start_link([{host, "localhost"}, {clientid, "myclient"}]), {ok, _} = emqtt:connect(C), ClientId = <<"myclient">>, Topic = <<"mytopic">>, diff --git a/test/emqx_client_SUITE.erl b/test/emqx_client_SUITE.erl index 1e74982c8..8c3d55cec 100644 --- a/test/emqx_client_SUITE.erl +++ b/test/emqx_client_SUITE.erl @@ -95,7 +95,7 @@ t_cm(_) -> IdleTimeout = emqx_zone:get_env(external, idle_timeout, 30000), emqx_zone:set_env(external, idle_timeout, 1000), ClientId = <<"myclient">>, - {ok, C} = emqtt:start_link([{client_id, ClientId}]), + {ok, C} = emqtt:start_link([{clientid, ClientId}]), {ok, _} = emqtt:connect(C), ct:sleep(500), #{clientinfo := #{clientid := ClientId}} = emqx_cm:get_chan_attrs(ClientId), @@ -135,13 +135,13 @@ t_will_message(_Config) -> t_offline_message_queueing(_) -> {ok, C1} = emqtt:start_link([{clean_start, false}, - {client_id, <<"c1">>}]), + {clientid, <<"c1">>}]), {ok, _} = emqtt:connect(C1), {ok, _, [2]} = emqtt:subscribe(C1, nth(6, ?WILD_TOPICS), 2), ok = emqtt:disconnect(C1), {ok, C2} = emqtt:start_link([{clean_start, true}, - {client_id, <<"c2">>}]), + {clientid, <<"c2">>}]), {ok, _} = emqtt:connect(C2), ok = emqtt:publish(C2, nth(2, ?TOPICS), <<"qos 0">>, 0), @@ -149,7 +149,7 @@ t_offline_message_queueing(_) -> {ok, _} = emqtt:publish(C2, nth(4, ?TOPICS), <<"qos 2">>, 2), timer:sleep(10), emqtt:disconnect(C2), - {ok, C3} = emqtt:start_link([{clean_start, false}, {client_id, <<"c1">>}]), + {ok, C3} = emqtt:start_link([{clean_start, false}, {clientid, <<"c1">>}]), {ok, _} = emqtt:connect(C3), timer:sleep(10), @@ -197,7 +197,7 @@ t_overlapping_subscriptions(_) -> t_redelivery_on_reconnect(_) -> ct:pal("Redelivery on reconnect test starting"), - {ok, C1} = emqtt:start_link([{clean_start, false}, {client_id, <<"c">>}]), + {ok, C1} = emqtt:start_link([{clean_start, false}, {clientid, <<"c">>}]), {ok, _} = emqtt:connect(C1), {ok, _, [2]} = emqtt:subscribe(C1, nth(7, ?WILD_TOPICS), 2), @@ -210,7 +210,7 @@ t_redelivery_on_reconnect(_) -> timer:sleep(10), ok = emqtt:disconnect(C1), ?assertEqual(0, length(recv_msgs(2))), - {ok, C2} = emqtt:start_link([{clean_start, false}, {client_id, <<"c">>}]), + {ok, C2} = emqtt:start_link([{clean_start, false}, {clientid, <<"c">>}]), {ok, _} = emqtt:connect(C2), timer:sleep(10), diff --git a/test/emqx_connection_SUITE.erl b/test/emqx_connection_SUITE.erl index d321d2c85..39cc67dee 100644 --- a/test/emqx_connection_SUITE.erl +++ b/test/emqx_connection_SUITE.erl @@ -33,7 +33,7 @@ end_per_suite(_Config) -> t_basic(_) -> Topic = <<"TopicA">>, - {ok, C} = emqtt:start_link([{port, 1883}, {client_id, <<"hello">>}]), + {ok, C} = emqtt:start_link([{port, 1883}, {clientid, <<"hello">>}]), {ok, _} = emqtt:connect(C), {ok, _, [1]} = emqtt:subscribe(C, Topic, qos1), {ok, _, [2]} = emqtt:subscribe(C, Topic, qos2), diff --git a/test/emqx_modules_SUITE.erl b/test/emqx_modules_SUITE.erl index 12f304f54..437a21aec 100644 --- a/test/emqx_modules_SUITE.erl +++ b/test/emqx_modules_SUITE.erl @@ -55,11 +55,11 @@ end_per_suite(_Config) -> %% Test case for emqx_mod_presence t_mod_presence(_) -> ok = emqx_mod_presence:load([{qos, ?QOS_1}]), - {ok, C1} = emqtt:start_link([{client_id, <<"monsys">>}]), + {ok, C1} = emqtt:start_link([{clientid, <<"monsys">>}]), {ok, _} = emqtt:connect(C1), {ok, _Props, [?QOS_1]} = emqtt:subscribe(C1, <<"$SYS/brokers/+/clients/#">>, qos1), %% Connected Presence - {ok, C2} = emqtt:start_link([{client_id, <<"clientid">>}, + {ok, C2} = emqtt:start_link([{clientid, <<"clientid">>}, {username, <<"username">>}]), {ok, _} = emqtt:connect(C2), ok = recv_and_check_presence(<<"clientid">>, <<"connected">>), @@ -98,7 +98,7 @@ recv_and_check_presence(ClientId, Presence) -> t_mod_subscription(_) -> emqx_mod_subscription:load([{<<"connected/%c/%u">>, ?QOS_0}]), {ok, C} = emqtt:start_link([{host, "localhost"}, - {client_id, "myclient"}, + {clientid, "myclient"}, {username, "admin"}]), {ok, _} = emqtt:connect(C), emqtt:publish(C, <<"connected/myclient/admin">>, <<"Hello world">>, ?QOS_0), @@ -111,7 +111,7 @@ t_mod_subscription(_) -> %% Test case for emqx_mod_write t_mod_rewrite(_Config) -> ok = emqx_mod_rewrite:load(?RULES), - {ok, C} = emqtt:start_link([{client_id, <<"rewrite_client">>}]), + {ok, C} = emqtt:start_link([{clientid, <<"rewrite_client">>}]), {ok, _} = emqtt:connect(C), OrigTopics = [<<"x/y/2">>, <<"x/1/2">>, <<"y/a/z/b">>, <<"y/def">>], DestTopics = [<<"z/y/2">>, <<"x/1/2">>, <<"y/z/b">>, <<"y/def">>], diff --git a/test/emqx_msg_expiry_interval_SUITE.erl b/test/emqx_msg_expiry_interval_SUITE.erl index 6fe18ff5a..063cf19dc 100644 --- a/test/emqx_msg_expiry_interval_SUITE.erl +++ b/test/emqx_msg_expiry_interval_SUITE.erl @@ -42,8 +42,8 @@ t_message_expiry_interval_2(_) -> emqtt:stop(ClientA). message_expiry_interval_init() -> - {ok, ClientA} = emqtt:start_link([{proto_ver,v5}, {client_id, <<"client-a">>}, {clean_start, false},{properties, #{'Session-Expiry-Interval' => 360}}]), - {ok, ClientB} = emqtt:start_link([{proto_ver,v5}, {client_id, <<"client-b">>}, {clean_start, false},{properties, #{'Session-Expiry-Interval' => 360}}]), + {ok, ClientA} = emqtt:start_link([{proto_ver,v5}, {clientid, <<"client-a">>}, {clean_start, false},{properties, #{'Session-Expiry-Interval' => 360}}]), + {ok, ClientB} = emqtt:start_link([{proto_ver,v5}, {clientid, <<"client-b">>}, {clean_start, false},{properties, #{'Session-Expiry-Interval' => 360}}]), {ok, _} = emqtt:connect(ClientA), {ok, _} = emqtt:connect(ClientB), %% subscribe and disconnect client-b @@ -58,7 +58,7 @@ message_expiry_interval_exipred(ClientA, QoS) -> ct:sleep(1500), %% resume the session for client-b - {ok, ClientB1} = emqtt:start_link([{proto_ver,v5}, {client_id, <<"client-b">>}, {clean_start, false},{properties, #{'Session-Expiry-Interval' => 360}}]), + {ok, ClientB1} = emqtt:start_link([{proto_ver,v5}, {clientid, <<"client-b">>}, {clean_start, false},{properties, #{'Session-Expiry-Interval' => 360}}]), {ok, _} = emqtt:connect(ClientB1), %% verify client-b could not receive the publish message @@ -78,7 +78,7 @@ message_expiry_interval_not_exipred(ClientA, QoS) -> %% wait for 1s and then resume the session for client-b, the message should not expires %% as Message-Expiry-Interval = 20s ct:sleep(1000), - {ok, ClientB1} = emqtt:start_link([{proto_ver,v5}, {client_id, <<"client-b">>}, {clean_start, false},{properties, #{'Session-Expiry-Interval' => 360}}]), + {ok, ClientB1} = emqtt:start_link([{proto_ver,v5}, {clientid, <<"client-b">>}, {clean_start, false},{properties, #{'Session-Expiry-Interval' => 360}}]), {ok, _} = emqtt:connect(ClientB1), %% verify client-b could receive the publish message and the Message-Expiry-Interval is set diff --git a/test/emqx_request_responser_SUITE.erl b/test/emqx_request_responser_SUITE.erl index d603f2b96..7d66c7760 100644 --- a/test/emqx_request_responser_SUITE.erl +++ b/test/emqx_request_responser_SUITE.erl @@ -42,7 +42,7 @@ request_response_per_qos(QoS) -> RspTopic = <<"response_topic">>, {ok, Requester} = emqx_request_sender:start_link(RspTopic, QoS, [{proto_ver, v5}, - {client_id, <<"requester">>}, + {clientid, <<"requester">>}, {properties, #{ 'Request-Response-Information' => 1}}]), %% This is a square service Square = fun(_CorrData, ReqBin) -> @@ -51,7 +51,7 @@ request_response_per_qos(QoS) -> end, {ok, Responser} = emqx_request_handler:start_link(ReqTopic, QoS, Square, [{proto_ver, v5}, - {client_id, <<"responser">>} + {clientid, <<"responser">>} ]), ok = emqx_request_sender:send(Requester, ReqTopic, RspTopic, <<"corr-1">>, <<"2">>, QoS), receive diff --git a/test/emqx_shared_sub_SUITE.erl b/test/emqx_shared_sub_SUITE.erl index 14baf8a76..9fec11171 100644 --- a/test/emqx_shared_sub_SUITE.erl +++ b/test/emqx_shared_sub_SUITE.erl @@ -80,9 +80,9 @@ t_no_connection_nack(_) -> ShareTopic = <<"$share/", Group/binary, $/, Topic/binary>>, ExpProp = [{properties, #{'Session-Expiry-Interval' => timer:seconds(30)}}], - {ok, SubConnPid1} = emqtt:start_link([{client_id, Subscriber1}] ++ ExpProp), + {ok, SubConnPid1} = emqtt:start_link([{clientid, Subscriber1}] ++ ExpProp), {ok, _Props} = emqtt:connect(SubConnPid1), - {ok, SubConnPid2} = emqtt:start_link([{client_id, Subscriber2}] ++ ExpProp), + {ok, SubConnPid2} = emqtt:start_link([{clientid, Subscriber2}] ++ ExpProp), {ok, _Props} = emqtt:connect(SubConnPid2), emqtt:subscribe(SubConnPid1, ShareTopic, QoS), emqtt:subscribe(SubConnPid1, ShareTopic, QoS), @@ -151,9 +151,9 @@ t_not_so_sticky(_) -> ok = ensure_config(sticky), ClientId1 = <<"ClientId1">>, ClientId2 = <<"ClientId2">>, - {ok, C1} = emqtt:start_link([{client_id, ClientId1}]), + {ok, C1} = emqtt:start_link([{clientid, ClientId1}]), {ok, _} = emqtt:connect(C1), - {ok, C2} = emqtt:start_link([{client_id, ClientId2}]), + {ok, C2} = emqtt:start_link([{clientid, ClientId2}]), {ok, _} = emqtt:connect(C2), emqtt:subscribe(C1, {<<"$share/group1/foo/bar">>, 0}), @@ -179,9 +179,9 @@ test_two_messages(Strategy, WithAck) -> Topic = <<"foo/bar">>, ClientId1 = <<"ClientId1">>, ClientId2 = <<"ClientId2">>, - {ok, ConnPid1} = emqtt:start_link([{client_id, ClientId1}]), + {ok, ConnPid1} = emqtt:start_link([{clientid, ClientId1}]), {ok, _} = emqtt:connect(ConnPid1), - {ok, ConnPid2} = emqtt:start_link([{client_id, ClientId2}]), + {ok, ConnPid2} = emqtt:start_link([{clientid, ClientId2}]), {ok, _} = emqtt:connect(ConnPid2), Message1 = emqx_message:make(ClientId1, 0, Topic, <<"hello1">>), diff --git a/test/emqx_tracer_SUITE.erl b/test/emqx_tracer_SUITE.erl index 2eee6a1e1..ece0f5799 100644 --- a/test/emqx_tracer_SUITE.erl +++ b/test/emqx_tracer_SUITE.erl @@ -35,7 +35,7 @@ end_per_suite(_Config) -> t_start_traces(_Config) -> {ok, T} = emqtt:start_link([{host, "localhost"}, - {client_id, <<"client">>}, + {clientid, <<"client">>}, {username, <<"testuser">>}, {password, <<"pass">>} ]),