Simplify test cases

1. Only run the CLI tests on a single node cluster. The shared_SUITE is
   already very big. Testing the same CLI commands against node-0 on a
   3-node cluster brings no benefit.
2. Move the two new CLI test cases in front of
   management_plugin_connection because they are similar in that all
   three tests close the MQTT connection.
3. There is no need to query the HTTP API for the two new CLI test
   cases.
4. There is no need to set keepalive in the two new CLI test cases.

Author: ansd

deps/rabbitmq_mqtt/test/shared_SUITE.erl

@@ -91,6 +91,8 @@ cluster_size_1_tests() ->
      ,block_only_publisher
      ,many_qos1_messages
      ,session_expiry
+     ,cli_close_all_connections
+     ,cli_close_all_user_connections
      ,management_plugin_connection
      ,management_plugin_enable
      ,disconnect
@@ -129,8 +131,6 @@ cluster_size_1_tests() ->
      ,retained_message_conversion
      ,bind_exchange_to_exchange
      ,bind_exchange_to_exchange_single_message
-     ,cli_close_all_connections
-     ,cli_close_all_user_connections
     ].
 
 cluster_size_3_tests() ->
@@ -143,8 +143,6 @@ cluster_size_3_tests() ->
      rabbit_mqtt_qos0_queue,
      rabbit_mqtt_qos0_queue_kill_node,
      cli_list_queues,
-     cli_close_all_connections,
-     cli_close_all_user_connections,
      delete_create_queue,
      session_reconnect,
      session_takeover,
@@ -211,9 +209,7 @@ end_per_group(_, Config) ->
 
 init_per_testcase(T, Config)
   when T =:= management_plugin_connection;
-       T =:= management_plugin_enable;
-       T =:= cli_close_all_user_connections;
-       T =:= cli_close_all_connections ->
+       T =:= management_plugin_enable ->
     inets:start(),
     init_per_testcase0(T, Config);
 init_per_testcase(Testcase, Config) ->
@@ -226,9 +222,7 @@ init_per_testcase0(Testcase, Config) ->
 
 end_per_testcase(T, Config)
   when T =:= management_plugin_connection;
-       T =:= management_plugin_enable;
-       T =:= cli_close_all_user_connections;
-       T =:= cli_close_all_connections ->
+       T =:= management_plugin_enable ->
     ok = inets:stop(),
     end_per_testcase0(T, Config);
 end_per_testcase(Testcase, Config) ->
@@ -1173,6 +1167,24 @@ rabbit_mqtt_qos0_queue_kill_node(Config) ->
     ok = rabbit_ct_broker_helpers:start_node(Config, 1),
     ?assertEqual([], rpc(Config, rabbit_db_binding, get_all, [])).
 
+cli_close_all_connections(Config) ->
+    ClientId = atom_to_binary(?FUNCTION_NAME),
+    C = connect(ClientId, Config),
+    process_flag(trap_exit, true),
+    {ok, String} = rabbit_ct_broker_helpers:rabbitmqctl(
+                     Config, 0, ["close_all_connections", "bye"]),
+    ?assertEqual(match, re:run(String, "Closing .* reason: bye", [{capture, none}])),
+    ok = await_exit(C).
+
+cli_close_all_user_connections(Config) ->
+    ClientId = atom_to_binary(?FUNCTION_NAME),
+    C = connect(ClientId, Config),
+    process_flag(trap_exit, true),
+    {ok, String} = rabbit_ct_broker_helpers:rabbitmqctl(
+                     Config, 0, ["close_all_user_connections","guest", "bye"]),
+    ?assertEqual(match, re:run(String, "Closing .* reason: bye", [{capture, none}])),
+    ok = await_exit(C).
+
 %% Test that MQTT connection can be listed and closed via the rabbitmq_management plugin.
 management_plugin_connection(Config) ->
     KeepaliveSecs = 99,
@@ -1216,36 +1228,6 @@ management_plugin_enable(Config) ->
 
     ok = emqtt:disconnect(C).
 
-cli_close_all_connections(Config) ->
-    KeepaliveSecs = 99,
-    ClientId = atom_to_binary(?FUNCTION_NAME),
-
-    _ = connect(ClientId, Config, [{keepalive, KeepaliveSecs}]),
-    eventually(?_assertEqual(1, length(http_get(Config, "/connections"))), 1000, 10),
-
-    process_flag(trap_exit, true),
-    {ok, String} = rabbit_ct_broker_helpers:rabbitmqctl(Config, 0, ["close_all_connections", "bye"]),
-    ?assertEqual(match, re:run(String, "Closing .* reason: bye", [{capture, none}])),
-
-    process_flag(trap_exit, false),
-    eventually(?_assertEqual([], http_get(Config, "/connections")),
-               1000, 10).
-
-cli_close_all_user_connections(Config) ->
-    KeepaliveSecs = 99,
-    ClientId = atom_to_binary(?FUNCTION_NAME),
-
-    _ = connect(ClientId, Config, [{keepalive, KeepaliveSecs}]),
-    eventually(?_assertEqual(1, length(http_get(Config, "/connections"))), 1000, 10),
-
-    process_flag(trap_exit, true),
-    {ok, String} = rabbit_ct_broker_helpers:rabbitmqctl(Config, 0, ["close_all_user_connections","guest", "bye"]),
-    ?assertEqual(match, re:run(String, "Closing .* reason: bye", [{capture, none}])),
-
-    process_flag(trap_exit, false),
-    eventually(?_assertEqual([], http_get(Config, "/connections")),
-               1000, 10).
-
 %% Test that queues of type rabbit_mqtt_qos0_queue can be listed via rabbitmqctl.
 cli_list_queues(Config) ->
     C = connect(?FUNCTION_NAME, Config),