Skip to content

Commit 84a4e83

Browse files
dcorbachomichaelklishin
authored andcommitted
Shovel tests: run unit_runtime_parameter_SUITE inside a broker
It needs the rabbit registry to select the protocols (cherry picked from commit 797f645)
1 parent 4f22f08 commit 84a4e83

File tree

1 file changed

+45
-18
lines changed

1 file changed

+45
-18
lines changed

deps/rabbitmq_shovel/test/unit_runtime_parameter_SUITE.erl

Lines changed: 45 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,22 @@ groups() ->
4343
%% -------------------------------------------------------------------
4444

4545
init_per_suite(Config) ->
46-
{ok, _} = application:ensure_all_started(credentials_obfuscation),
4746
Secret = crypto:strong_rand_bytes(128),
48-
ok = credentials_obfuscation:set_secret(Secret),
49-
Config.
47+
rabbit_ct_helpers:log_environment(),
48+
Config1 = rabbit_ct_helpers:set_config(
49+
Config, [{rmq_nodename_suffix, ?MODULE}]),
50+
Config2 = rabbit_ct_helpers:run_setup_steps(
51+
Config1,
52+
rabbit_ct_broker_helpers:setup_steps() ++
53+
rabbit_ct_client_helpers:setup_steps()),
54+
ok = rabbit_ct_broker_helpers:rpc(Config2, 0, credentials_obfuscation,
55+
set_secret, [Secret]),
56+
Config2.
5057

5158
end_per_suite(Config) ->
52-
case application:stop(credentials_obfuscation) of
53-
ok ->
54-
ok;
55-
{error, {not_started, credentials_obfuscation}} ->
56-
ok
57-
end,
58-
Config.
59+
rabbit_ct_helpers:run_teardown_steps(Config,
60+
rabbit_ct_client_helpers:teardown_steps() ++
61+
rabbit_ct_broker_helpers:teardown_steps()).
5962

6063
init_per_group(_, Config) ->
6164
Config.
@@ -74,7 +77,10 @@ end_per_testcase(_Testcase, Config) ->
7477
%% Testcases.
7578
%% -------------------------------------------------------------------
7679

77-
parse_amqp091_maps(_Config) ->
80+
parse_amqp091_maps(Config) ->
81+
ok = rabbit_ct_broker_helpers:rpc(Config, 0, ?MODULE, parse_amqp091_maps_0, []).
82+
83+
parse_amqp091_maps_0() ->
7884
Params =
7985
[{<<"src-uri">>, <<"amqp://localhost:5672">>},
8086
{<<"src-protocol">>, <<"amqp091">>},
@@ -94,7 +100,10 @@ parse_amqp091_maps(_Config) ->
94100

95101
test_parse_amqp091(Params).
96102

97-
parse_amqp091_proplists(_Config) ->
103+
parse_amqp091_proplists(Config) ->
104+
ok = rabbit_ct_broker_helpers:rpc(Config, 0, ?MODULE, parse_amqp091_proplists_0, []).
105+
106+
parse_amqp091_proplists_0() ->
98107
Params =
99108
[{<<"src-uri">>, <<"amqp://localhost:5672">>},
100109
{<<"src-protocol">>, <<"amqp091">>},
@@ -113,7 +122,10 @@ parse_amqp091_proplists(_Config) ->
113122
],
114123
test_parse_amqp091(Params).
115124

116-
parse_amqp091_empty_maps(_Config) ->
125+
parse_amqp091_empty_maps(Config) ->
126+
ok = rabbit_ct_broker_helpers:rpc(Config, 0, ?MODULE, parse_amqp091_empty_maps_0, []).
127+
128+
parse_amqp091_empty_maps_0() ->
117129
Params =
118130
[{<<"src-uri">>, <<"amqp://localhost:5672">>},
119131
{<<"src-protocol">>, <<"amqp091">>},
@@ -131,7 +143,10 @@ parse_amqp091_empty_maps(_Config) ->
131143
],
132144
test_parse_amqp091_with_blank_proprties(Params).
133145

134-
parse_amqp091_empty_proplists(_Config) ->
146+
parse_amqp091_empty_proplists(Config) ->
147+
ok = rabbit_ct_broker_helpers:rpc(Config, 0, ?MODULE, parse_amqp091_empty_proplists_0, []).
148+
149+
parse_amqp091_empty_proplists_0() ->
135150
Params =
136151
[{<<"src-uri">>, <<"amqp://localhost:5672">>},
137152
{<<"src-protocol">>, <<"amqp091">>},
@@ -219,7 +234,10 @@ assert_amqp901_headers(ActualHeaders) ->
219234
end, ExpectedHeaders),
220235
ok.
221236

222-
parse_amqp10(_Config) ->
237+
parse_amqp10(Config) ->
238+
ok = rabbit_ct_broker_helpers:rpc(Config, 0, ?MODULE, parse_amqp10_0, []).
239+
240+
parse_amqp10_0() ->
223241
Params =
224242
[
225243
{<<"ack-mode">>, <<"on-publish">>},
@@ -268,7 +286,10 @@ parse_amqp10(_Config) ->
268286
ObfuscatedParams)),
269287
ok.
270288

271-
parse_amqp10_minimal(_Config) ->
289+
parse_amqp10_minimal(Config) ->
290+
ok = rabbit_ct_broker_helpers:rpc(Config, 0, ?MODULE, parse_amqp10_minimal_0, []).
291+
292+
parse_amqp10_minimal_0() ->
272293
Params =
273294
[
274295
{<<"src-protocol">>, <<"amqp10">>},
@@ -298,7 +319,10 @@ parse_amqp10_minimal(_Config) ->
298319
ObfuscatedParams)),
299320
ok.
300321

301-
validate_amqp10(_Config) ->
322+
validate_amqp10(Config) ->
323+
ok = rabbit_ct_broker_helpers:rpc(Config, 0, ?MODULE, validate_amqp10_0, []).
324+
325+
validate_amqp10_0() ->
302326
Params =
303327
[
304328
{<<"ack-mode">>, <<"on-publish">>},
@@ -327,7 +351,10 @@ validate_amqp10(_Config) ->
327351
[] = validate_ok(Res),
328352
ok.
329353

330-
validate_amqp10_with_a_map(_Config) ->
354+
validate_amqp10_with_a_map(Config) ->
355+
ok = rabbit_ct_broker_helpers:rpc(Config, 0, ?MODULE, validate_amqp10_with_a_map_0, []).
356+
357+
validate_amqp10_with_a_map_0() ->
331358
Params =
332359
#{
333360
<<"ack-mode">> => <<"on-publish">>,

0 commit comments

Comments
 (0)