Skip to content

Commit eae5d95

Browse files
michaelklishinmichaelklishin
authored
Merge pull request #11596 from rabbitmq/mergify/bp/v3.13.x/pr-11582
Various test improvements (backport #11582)
2 parents e22055e + e79944a commit eae5d95

15 files changed

+118
-228
lines changed

‎deps/rabbit/BUILD.bazel‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -610,13 +610,13 @@ rabbitmq_integration_suite(
610610
rabbitmq_integration_suite(
611611
name = "per_user_connection_channel_limit_SUITE",
612612
size = "medium",
613-
shard_count = 7,
613+
shard_count = 4,
614614
)
615615

616616
rabbitmq_integration_suite(
617617
name = "per_user_connection_channel_tracking_SUITE",
618618
size = "medium",
619-
shard_count = 8,
619+
shard_count = 4,
620620
)
621621

622622
rabbitmq_integration_suite(
@@ -632,7 +632,7 @@ rabbitmq_integration_suite(
632632
rabbitmq_integration_suite(
633633
name = "per_vhost_connection_limit_SUITE",
634634
size = "medium",
635-
shard_count = 9,
635+
shard_count = 5,
636636
)
637637

638638
rabbitmq_integration_suite(

‎deps/rabbit/test/bindings_SUITE.erl‎

Lines changed: 21 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,18 @@ suite() ->
2020

2121
all() ->
2222
[
23-
{group, mnesia_store},
24-
{group, khepri_store},
23+
% {group, tests},
2524
{group, khepri_migration},
26-
{group, mnesia_cluster},
27-
{group, khepri_cluster}
25+
{group, cluster}
2826
].
2927

3028
groups() ->
3129
[
32-
{mnesia_store, [], all_tests()},
33-
{khepri_store, [], all_tests()},
30+
% {tests, [], all_tests()},
3431
{khepri_migration, [], [
3532
from_mnesia_to_khepri
3633
]},
37-
{mnesia_cluster, [], [
38-
transient_queue_on_node_down
39-
]},
40-
{khepri_cluster, [], [
41-
transient_queue_on_node_down
42-
]}
34+
{cluster, [], all_tests()}
4335
].
4436

4537
all_tests() ->
@@ -61,7 +53,8 @@ all_tests() ->
6153
bind_and_unbind_exchange,
6254
bind_and_delete_exchange_source,
6355
bind_and_delete_exchange_destination,
64-
bind_to_unknown_exchange
56+
bind_to_unknown_exchange,
57+
transient_queue_on_node_down
6558
].
6659

6760
%% -------------------------------------------------------------------
@@ -75,27 +68,24 @@ init_per_suite(Config) ->
7568
end_per_suite(Config) ->
7669
rabbit_ct_helpers:run_teardown_steps(Config).
7770

78-
init_per_group(mnesia_store = Group, Config0) ->
79-
Config = rabbit_ct_helpers:set_config(Config0, [{metadata_store, mnesia}]),
80-
init_per_group_common(Group, Config, 1);
81-
init_per_group(khepri_store = Group, Config0) ->
82-
Config = rabbit_ct_helpers:set_config(Config0, [{metadata_store, khepri}]),
83-
init_per_group_common(Group, Config, 1);
84-
init_per_group(khepri_migration = Group, Config0) ->
85-
Config = rabbit_ct_helpers:set_config(Config0, [{metadata_store, mnesia}]),
86-
init_per_group_common(Group, Config, 1);
87-
init_per_group(mnesia_cluster = Group, Config0) ->
88-
Config = rabbit_ct_helpers:set_config(Config0, [{metadata_store, mnesia}]),
89-
init_per_group_common(Group, Config, 3);
90-
init_per_group(khepri_cluster = Group, Config0) ->
91-
Config = rabbit_ct_helpers:set_config(Config0, [{metadata_store, khepri}]),
71+
% init_per_group(tests = Group, Config) ->
72+
% init_per_group_common(Group, Config, 1);
73+
init_per_group(khepri_migration = Group, Config) ->
74+
case rabbit_ct_broker_helpers:configured_metadata_store(Config) of
75+
{khepri, _} ->
76+
{skip, "skip khepri migration test when khepri already configured"};
77+
mnesia ->
78+
init_per_group_common(Group, Config, 1)
79+
end;
80+
init_per_group(cluster = Group, Config) ->
9281
init_per_group_common(Group, Config, 3).
9382

9483
init_per_group_common(Group, Config, Size) ->
9584
Config1 = rabbit_ct_helpers:set_config(Config,
9685
[{rmq_nodes_count, Size},
9786
{rmq_nodename_suffix, Group},
98-
{tcp_ports_base}]),
87+
{tcp_ports_base, {skip_n_nodes, Size}}
88+
]),
9989
rabbit_ct_helpers:run_steps(Config1, rabbit_ct_broker_helpers:setup_steps()).
10090

10191
end_per_group(_, Config) ->
@@ -853,7 +843,8 @@ transient_queue_on_node_down(Config) ->
853843
rabbit_ct_broker_helpers:rpc(Config, 1, rabbit_binding, list, [<<"/">>])),
854844
30000),
855845

856-
rabbit_ct_broker_helpers:stop_node(Config, Server),
846+
847+
?assertEqual(ok, rabbit_control_helper:command(stop_app, Server)),
857848

858849
?awaitMatch([DirectBinding],
859850
lists:sort(
@@ -863,7 +854,7 @@ transient_queue_on_node_down(Config) ->
863854
rabbit_ct_broker_helpers:rpc(Config, 1, rabbit_amqqueue, list, [<<"/">>]),
864855
30000),
865856

866-
rabbit_ct_broker_helpers:start_node(Config, Server),
857+
?assertEqual(ok, rabbit_control_helper:command(start_app, Server)),
867858

868859
Bindings2 = lists:sort([DefaultBinding, DirectBinding]),
869860
?awaitMatch(Bindings2,

‎deps/rabbit/test/clustering_management_SUITE.erl‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
-include_lib("common_test/include/ct.hrl").
1111
-include_lib("amqp_client/include/amqp_client.hrl").
1212
-include_lib("eunit/include/eunit.hrl").
13-
-include_lib("rabbitmq_ct_helpers/include/rabbit_assert.hrl").
14-
13+
-compile(nowarn_export_all).
1514
-compile(export_all).
1615

1716
-import(clustering_utils, [

‎deps/rabbit/test/clustering_recovery_SUITE.erl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
-include_lib("amqp_client/include/amqp_client.hrl").
1212
-include_lib("eunit/include/eunit.hrl").
1313

14+
-compile(nowarn_export_all).
1415
-compile(export_all).
1516

1617
-import(clustering_utils, [

‎deps/rabbit/test/per_user_connection_channel_limit_SUITE.erl‎

Lines changed: 13 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
-include_lib("eunit/include/eunit.hrl").
1313
-include_lib("rabbitmq_ct_helpers/include/rabbit_assert.hrl").
1414

15+
-compile(nowarn_export_all).
1516
-compile(export_all).
1617

1718
all() ->
1819
[
19-
{group, mnesia_store},
20-
{group, khepri_store},
20+
{group, tests},
2121
{group, khepri_migration}
2222
].
2323

@@ -35,7 +35,7 @@ groups() ->
3535
single_node_multiple_users_zero_limit
3636

3737
],
38-
ClusterSize2Tests = [
38+
ClusterSize3Tests = [
3939
most_basic_cluster_connection_and_channel_count,
4040
cluster_single_user_connection_and_channel_count,
4141
cluster_multiple_users_connection_and_channel_count,
@@ -49,16 +49,11 @@ groups() ->
4949
cluster_multiple_users_zero_limit
5050
],
5151
[
52-
{mnesia_store, [], [
53-
{cluster_size_1_network, [], ClusterSize1Tests},
54-
{cluster_size_3_network, [], ClusterSize2Tests},
55-
{cluster_size_3_direct, [], ClusterSize2Tests}
56-
]},
57-
{khepri_store, [], [
58-
{cluster_size_1_network, [], ClusterSize1Tests},
59-
{cluster_size_3_network, [], ClusterSize2Tests},
60-
{cluster_size_3_direct, [], ClusterSize2Tests}
61-
]},
52+
{tests, [], [
53+
{cluster_size_1_network, [], ClusterSize1Tests},
54+
{cluster_size_3_network, [], ClusterSize3Tests},
55+
{cluster_size_3_direct, [], ClusterSize3Tests}
56+
]},
6257
{khepri_migration, [], [from_mnesia_to_khepri]}
6358
].
6459

@@ -79,10 +74,6 @@ init_per_suite(Config) ->
7974
end_per_suite(Config) ->
8075
rabbit_ct_helpers:run_teardown_steps(Config).
8176

82-
init_per_group(mnesia_store, Config) ->
83-
rabbit_ct_helpers:set_config(Config, [{metadata_store, mnesia}]);
84-
init_per_group(khepri_store, Config) ->
85-
rabbit_ct_helpers:set_config(Config, [{metadata_store, khepri}]);
8677
init_per_group(khepri_migration, Config) ->
8778
Config1 = rabbit_ct_helpers:set_config(Config, [{connection_type, network},
8879
{metadata_store, mnesia}]),
@@ -96,26 +87,20 @@ init_per_group(cluster_size_3_network, Config) ->
9687
init_per_group(cluster_size_3_direct, Config) ->
9788
Config1 = rabbit_ct_helpers:set_config(Config, [{connection_type, direct}]),
9889
init_per_multinode_group(cluster_size_3_direct, Config1, 3);
99-
init_per_group(cluster_rename, Config) ->
100-
init_per_multinode_group(cluster_rename, Config, 2).
90+
init_per_group(tests, Config) ->
91+
Config.
10192

102-
init_per_multinode_group(Group, Config, NodeCount) ->
93+
init_per_multinode_group(_Group, Config, NodeCount) ->
10394
Suffix = rabbit_ct_helpers:testcase_absname(Config, "", "-"),
10495
Config1 = rabbit_ct_helpers:set_config(Config, [
10596
{rmq_nodes_count, NodeCount},
10697
{rmq_nodename_suffix, Suffix}
10798
]),
108-
case Group of
109-
cluster_rename ->
110-
% The broker is managed by {init,end}_per_testcase().
111-
Config1;
112-
_ ->
11399
rabbit_ct_helpers:run_steps(
114100
Config1, rabbit_ct_broker_helpers:setup_steps() ++
115-
rabbit_ct_client_helpers:setup_steps())
116-
end.
101+
rabbit_ct_client_helpers:setup_steps()).
117102

118-
end_per_group(Group, Config) when Group == mnesia_store; Group == khepri_store ->
103+
end_per_group(tests, Config) ->
119104
% The broker is managed by {init,end}_per_testcase().
120105
Config;
121106
end_per_group(_Group, Config) ->

‎deps/rabbit/test/per_user_connection_channel_tracking_SUITE.erl‎

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
-include_lib("eunit/include/eunit.hrl").
1313
-include_lib("rabbitmq_ct_helpers/include/rabbit_assert.hrl").
1414

15+
-compile(nowarn_export_all).
1516
-compile(export_all).
1617

1718
-define(A_TOUT, 20000).
1819

1920
all() ->
2021
[
21-
{group, mnesia_store},
22-
{group, khepri_store}
22+
{group, tests}
2323
].
2424

2525
groups() ->
@@ -36,18 +36,12 @@ groups() ->
3636
cluster_node_removed
3737
],
3838
[
39-
{mnesia_store, [], [
40-
{cluster_size_1_network, [], ClusterSize1Tests},
41-
{cluster_size_3_network, [], ClusterSize3Tests},
42-
{cluster_size_1_direct, [], ClusterSize1Tests},
43-
{cluster_size_3_direct, [], ClusterSize3Tests}
44-
]},
45-
{khepri_store, [], [
46-
{cluster_size_1_network, [], ClusterSize1Tests},
47-
{cluster_size_3_network, [], ClusterSize3Tests},
48-
{cluster_size_1_direct, [], ClusterSize1Tests},
49-
{cluster_size_3_direct, [], ClusterSize3Tests}
50-
]}
39+
{tests, [], [
40+
{cluster_size_1_network, [], ClusterSize1Tests},
41+
{cluster_size_3_network, [], ClusterSize3Tests},
42+
{cluster_size_1_direct, [], ClusterSize1Tests},
43+
{cluster_size_3_direct, [], ClusterSize3Tests}
44+
]}
5145
].
5246

5347
suite() ->
@@ -67,10 +61,6 @@ init_per_suite(Config) ->
6761
end_per_suite(Config) ->
6862
rabbit_ct_helpers:run_teardown_steps(Config).
6963

70-
init_per_group(mnesia_store, Config) ->
71-
rabbit_ct_helpers:set_config(Config, [{metadata_store, mnesia}]);
72-
init_per_group(khepri_store, Config) ->
73-
rabbit_ct_helpers:set_config(Config, [{metadata_store, khepri}]);
7464
init_per_group(cluster_size_1_network, Config) ->
7565
Config1 = rabbit_ct_helpers:set_config(Config, [{connection_type, network}]),
7666
init_per_multinode_group(cluster_size_1_network, Config1, 1);
@@ -82,7 +72,9 @@ init_per_group(cluster_size_1_direct, Config) ->
8272
init_per_multinode_group(cluster_size_1_direct, Config1, 1);
8373
init_per_group(cluster_size_3_direct, Config) ->
8474
Config1 = rabbit_ct_helpers:set_config(Config, [{connection_type, direct}]),
85-
init_per_multinode_group(cluster_size_3_direct, Config1, 3).
75+
init_per_multinode_group(cluster_size_3_direct, Config1, 3);
76+
init_per_group(_Group, Config) ->
77+
Config.
8678

8779
init_per_multinode_group(_Group, Config, NodeCount) ->
8880
Suffix = rabbit_ct_helpers:testcase_absname(Config, "", "-"),
@@ -94,7 +86,7 @@ init_per_multinode_group(_Group, Config, NodeCount) ->
9486
Config1, rabbit_ct_broker_helpers:setup_steps() ++
9587
rabbit_ct_client_helpers:setup_steps()).
9688

97-
end_per_group(Group, Config) when Group == mnesia_store; Group == khepri_store ->
89+
end_per_group(tests, Config) ->
9890
% The broker is managed by {init,end}_per_testcase().
9991
Config;
10092
end_per_group(_Group, Config) ->

‎deps/rabbit/test/per_user_connection_tracking_SUITE.erl‎

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
-include_lib("amqp_client/include/amqp_client.hrl").
1313
-include_lib("eunit/include/eunit.hrl").
1414

15+
-compile(nowarn_export_all).
1516
-compile(export_all).
1617

1718
-define(AWAIT_TIMEOUT, 30000).
1819

1920
all() ->
2021
[
21-
{group, mnesia_store},
22-
{group, khepri_store}
22+
{group, tests}
2323
].
2424

2525
groups() ->
@@ -31,18 +31,12 @@ groups() ->
3131
cluster_user_deletion_forces_connection_closure
3232
],
3333
[
34-
{mnesia_store, [], [
35-
{cluster_size_1_network, [], ClusterSize1Tests},
36-
{cluster_size_2_network, [], ClusterSize2Tests},
37-
{cluster_size_1_direct, [], ClusterSize1Tests},
38-
{cluster_size_2_direct, [], ClusterSize2Tests}
39-
]},
40-
{khepri_store, [], [
41-
{cluster_size_1_network, [], ClusterSize1Tests},
42-
{cluster_size_2_network, [], ClusterSize2Tests},
43-
{cluster_size_1_direct, [], ClusterSize1Tests},
44-
{cluster_size_2_direct, [], ClusterSize2Tests}
45-
]}
34+
{tests, [], [
35+
{cluster_size_1_network, [], ClusterSize1Tests},
36+
{cluster_size_2_network, [], ClusterSize2Tests},
37+
{cluster_size_1_direct, [], ClusterSize1Tests},
38+
{cluster_size_2_direct, [], ClusterSize2Tests}
39+
]}
4640
].
4741

4842
suite() ->
@@ -62,10 +56,6 @@ init_per_suite(Config) ->
6256
end_per_suite(Config) ->
6357
rabbit_ct_helpers:run_teardown_steps(Config).
6458

65-
init_per_group(mnesia_store, Config) ->
66-
rabbit_ct_helpers:set_config(Config, [{metadata_store, mnesia}]);
67-
init_per_group(khepri_store, Config) ->
68-
rabbit_ct_helpers:set_config(Config, [{metadata_store, khepri}]);
6959
init_per_group(cluster_size_1_network, Config) ->
7060
Config1 = rabbit_ct_helpers:set_config(Config, [{connection_type, network}]),
7161
init_per_multinode_group(cluster_size_1_network, Config1, 1);
@@ -77,7 +67,9 @@ init_per_group(cluster_size_1_direct, Config) ->
7767
init_per_multinode_group(cluster_size_1_direct, Config1, 1);
7868
init_per_group(cluster_size_2_direct, Config) ->
7969
Config1 = rabbit_ct_helpers:set_config(Config, [{connection_type, direct}]),
80-
init_per_multinode_group(cluster_size_2_direct, Config1, 2).
70+
init_per_multinode_group(cluster_size_2_direct, Config1, 2);
71+
init_per_group(tests, Config) ->
72+
Config.
8173

8274
init_per_multinode_group(_Group, Config, NodeCount) ->
8375
Suffix = rabbit_ct_helpers:testcase_absname(Config, "", "-"),
@@ -89,7 +81,7 @@ init_per_multinode_group(_Group, Config, NodeCount) ->
8981
rabbit_ct_broker_helpers:setup_steps() ++
9082
rabbit_ct_client_helpers:setup_steps()).
9183

92-
end_per_group(Group, Config) when Group == mnesia_store; Group == khepri_store ->
84+
end_per_group(tests, Config) ->
9385
% The broker is managed by {init,end}_per_testcase().
9486
Config;
9587
end_per_group(_Group, Config) ->

0 commit comments

Comments
 (0)