root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Cosmetics

This commit is contained in:
Michael Klishin 2019-02-03 19:43:44 +03:00
parent 08f97b9e6f
commit 9caf40afa1
1 changed files with 28 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
deps/rabbitmq_mqtt/test/retainer_SUITE.erl vendored
View File

@ -12,7 +12,7 @@ groups() ->
[ [
{non_parallel_tests, [], [ {non_parallel_tests, [], [
coerce_configuration_data, coerce_configuration_data,
should_translate_amqp2mqtt_on_publish, should_translate_amqp2mqtt_on_publish,
should_translate_amqp2mqtt_on_retention, should_translate_amqp2mqtt_on_retention,
should_translate_amqp2mqtt_on_retention_search should_translate_amqp2mqtt_on_retention_search
]} ]}
@ -71,12 +71,7 @@ end_per_testcase(Testcase, Config) ->
coerce_configuration_data(Config) -> coerce_configuration_data(Config) ->
P = rabbit_ct_broker_helpers:get_node_config(Config, 0, tcp_port_mqtt), P = rabbit_ct_broker_helpers:get_node_config(Config, 0, tcp_port_mqtt),
{ok, C} = emqttc:start_link([{host, "localhost"}, {ok, C} = emqttc:start_link(connection_opts(P)),
{port, P},
{client_id, <<"simpleClientRetainer">>},
{proto_ver, 3},
{logger, info},
{puback_timeout, 1}]),
emqttc:subscribe(C, <<"TopicA">>, qos0), emqttc:subscribe(C, <<"TopicA">>, qos0),
emqttc:publish(C, <<"TopicA">>, <<"Payload">>), emqttc:publish(C, <<"TopicA">>, <<"Payload">>),
@ -86,10 +81,10 @@ coerce_configuration_data(Config) ->
ok. ok.
expect_publishes(_Topic, []) -> ok; expect_publishes(_Topic, []) -> ok;
expect_publishes(Topic, [Payload|Rest]) -> expect_publishes(Topic, [Payload | Rest]) ->
receive receive
{publish, Topic, Payload} -> expect_publishes(Topic, Rest) {publish, Topic, Payload} -> expect_publishes(Topic, Rest)
after 500 -> after 1500 ->
throw({publish_not_delivered, Payload}) throw({publish_not_delivered, Payload})
end. end.
@ -100,17 +95,12 @@ expect_publishes(Topic, [Payload|Rest]) ->
%% ------------------------------------------------------------------- %% -------------------------------------------------------------------
should_translate_amqp2mqtt_on_publish(Config) -> should_translate_amqp2mqtt_on_publish(Config) ->
P = rabbit_ct_broker_helpers:get_node_config(Config, 0, tcp_port_mqtt), P = rabbit_ct_broker_helpers:get_node_config(Config, 0, tcp_port_mqtt),
{ok, C} = emqttc:start_link([{host, "localhost"}, {ok, C} = emqttc:start_link(connection_opts(P)),
{port, P}, %% there's an active consumer
{client_id, <<"simpleClientRetainer">>}, emqttc:subscribe(C, <<"TopicA/Device.Field">>, qos1),
{proto_ver,3}, emqttc:publish(C, <<"TopicA/Device.Field">>, <<"Payload">>, [{retain, true}]),
{logger, info}, expect_publishes(<<"TopicA/Device/Field">>, [<<"Payload">>]),
{puback_timeout, 1}]), emqttc:disconnect(C).
emqttc:subscribe(C, <<"TopicA/Device.Field">>, qos1),
emqttc:publish(C,<<"TopicA/Device.Field">>, <<"Payload">>, [{retain,true}]),
expect_publishes(<<"TopicA/Device/Field">>, [<<"Payload">>]),
emqttc:disconnect(C),
ok.
%% ------------------------------------------------------------------- %% -------------------------------------------------------------------
%% If a client is publishes a retained message to TopicA/Device.Field and another %% If a client is publishes a retained message to TopicA/Device.Field and another
@ -119,33 +109,31 @@ should_translate_amqp2mqtt_on_publish(Config) ->
%% ------------------------------------------------------------------- %% -------------------------------------------------------------------
should_translate_amqp2mqtt_on_retention(Config) -> should_translate_amqp2mqtt_on_retention(Config) ->
P = rabbit_ct_broker_helpers:get_node_config(Config, 0, tcp_port_mqtt), P = rabbit_ct_broker_helpers:get_node_config(Config, 0, tcp_port_mqtt),
{ok, C} = emqttc:start_link([{host, "localhost"}, {ok, C} = emqttc:start_link(connection_opts(P)),
{port, P}, %% publish with retain = true before a consumer comes around
{client_id, <<"simpleClientRetainer">>}, emqttc:publish(C, <<"TopicA/Device.Field">>, <<"Payload">>, [{retain, true}]),
{proto_ver,3}, emqttc:subscribe(C, <<"TopicA/Device.Field">>, qos1),
{logger, info}, expect_publishes(<<"TopicA/Device/Field">>, [<<"Payload">>]),
{puback_timeout, 1}]), emqttc:disconnect(C).
emqttc:publish(C,<<"TopicA/Device.Field">>, <<"Payload">>, [{retain,true}]),
emqttc:subscribe(C, <<"TopicA/Device.Field">>, qos1),
expect_publishes(<<"TopicA/Device/Field">>, [<<"Payload">>]),
emqttc:disconnect(C),
ok.
%% ------------------------------------------------------------------- %% -------------------------------------------------------------------
%% If a client is publishes a retained message to TopicA/Device.Field and another %% If a client is publishes a retained message to TopicA/Device.Field and another
%% client subscribes to TopicA/Device.Field the client should be %% client subscribes to TopicA/Device/Field the client should be
%% sent retained message for the translated topic (TopicA/Device/Field) %% sent retained message for the translated topic (TopicA/Device/Field)
%% ------------------------------------------------------------------- %% -------------------------------------------------------------------
should_translate_amqp2mqtt_on_retention_search(Config) -> should_translate_amqp2mqtt_on_retention_search(Config) ->
P = rabbit_ct_broker_helpers:get_node_config(Config, 0, tcp_port_mqtt), P = rabbit_ct_broker_helpers:get_node_config(Config, 0, tcp_port_mqtt),
{ok, C} = emqttc:start_link([{host, "localhost"}, {ok, C} = emqttc:start_link(connection_opts(P)),
{port, P}, emqttc:publish(C, <<"TopicA/Device.Field">>, <<"Payload">>, [{retain, true}]),
{client_id, <<"simpleClientRetainer">>},
{proto_ver,3},
{logger, info},
{puback_timeout, 1}]),
emqttc:publish(C,<<"TopicA/Device.Field">>, <<"Payload">>, [{retain,true}]),
emqttc:subscribe(C, <<"TopicA/Device/Field">>, qos1), emqttc:subscribe(C, <<"TopicA/Device/Field">>, qos1),
expect_publishes(<<"TopicA/Device/Field">>, [<<"Payload">>]), expect_publishes(<<"TopicA/Device/Field">>, [<<"Payload">>]),
emqttc:disconnect(C), emqttc:disconnect(C),
ok. ok.
connection_opts(Port) ->
[{host, "localhost"},
{port, Port},
{client_id, <<"simpleClientRetainer">>},
{proto_ver,3},
{logger, info},
{puback_timeout, 1}].