Skip to content

Commit c2350b1

Browse files
Update tests to not use foobar x-arguments
Queues now validate x-arguments in addition to policy definitions.
1 parent 9ce3618 commit c2350b1

File tree

2 files changed

+17
-11
lines changed

2 files changed

+17
-11
lines changed

deps/rabbitmq_management/test/rabbit_mgmt_http_SUITE.erl

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2470,13 +2470,16 @@ format_output_test(Config) ->
24702470
passed.
24712471

24722472
columns_test(Config) ->
2473-
http_put(Config, "/queues/%2F/test", [{arguments, [{<<"foo">>, <<"bar">>}]}],
2473+
Path = "/queues/%2F/columns.test",
2474+
TTL = 30000,
2475+
http_delete(Config, Path, [{group, '2xx'}, 404]),
2476+
http_put(Config, Path, [{arguments, [{<<"x-message-ttl">>, TTL}]}],
24742477
{group, '2xx'}),
2475-
Item = #{arguments => #{foo => <<"bar">>}, name => <<"test">>},
2478+
Item = #{arguments => #{'x-message-ttl' => TTL}, name => <<"columns.test">>},
24762479
timer:sleep(2000),
2477-
[Item] = http_get(Config, "/queues?columns=arguments.foo,name", ?OK),
2478-
Item = http_get(Config, "/queues/%2F/test?columns=arguments.foo,name", ?OK),
2479-
http_delete(Config, "/queues/%2F/test", {group, '2xx'}),
2480+
[Item] = http_get(Config, "/queues?columns=arguments.x-message-ttl,name", ?OK),
2481+
Item = http_get(Config, "/queues/%2F/columns.test?columns=arguments.x-message-ttl,name", ?OK),
2482+
http_delete(Config, Path, {group, '2xx'}),
24802483
passed.
24812484

24822485
get_test(Config) ->

deps/rabbitmq_management/test/rabbit_mgmt_only_http_SUITE.erl

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1567,16 +1567,19 @@ sorting_test(Config) ->
15671567
passed.
15681568

15691569
columns_test(Config) ->
1570-
http_put(Config, "/queues/%2F/test", [{arguments, [{<<"foo">>, <<"bar">>}]}],
1570+
Path = "/queues/%2F/columns.test",
1571+
TTL = 30000,
1572+
http_delete(Config, Path, [{group, '2xx'}, 404]),
1573+
http_put(Config, Path, [{arguments, [{<<"x-message-ttl">>, TTL}]}],
15711574
{group, '2xx'}),
1572-
Item = #{arguments => #{foo => <<"bar">>}, name => <<"test">>},
1573-
timer:sleep(1500),
1574-
[Item] = http_get(Config, "/queues?columns=arguments.foo,name", ?OK),
1575-
Item = http_get(Config, "/queues/%2F/test?columns=arguments.foo,name", ?OK),
1575+
Item = #{arguments => #{'x-message-ttl' => TTL}, name => <<"columns.test">>},
1576+
timer:sleep(2000),
1577+
[Item] = http_get(Config, "/queues?columns=arguments.x-message-ttl,name", ?OK),
1578+
Item = http_get(Config, "/queues/%2F/columns.test?columns=arguments.x-message-ttl,name", ?OK),
15761579
?assert(not maps:is_key(message_stats, Item)),
15771580
?assert(not maps:is_key(messages_details, Item)),
15781581
?assert(not maps:is_key(reductions_details, Item)),
1579-
http_delete(Config, "/queues/%2F/test", {group, '2xx'}),
1582+
http_delete(Config, Path, {group, '2xx'}),
15801583
passed.
15811584

15821585
if_empty_unused_test(Config) ->

0 commit comments

Comments
 (0)