Skip to content

Commit 7413939

Browse files
rabbitmq_shovel_management tests: whitelist expected exceptions in node logs
(cherry picked from commit 4688150)
1 parent d2198f6 commit 7413939

File tree

2 files changed

+19
-3
lines changed

2 files changed

+19
-3
lines changed

deps/rabbitmq_shovel_management/src/rabbit_shovel_mgmt_util.erl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
-import(rabbit_misc, [pget/2]).
1717

18+
-include_lib("kernel/include/logger.hrl").
1819
-include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl").
1920
-include_lib("amqp_client/include/amqp_client.hrl").
2021
-include("rabbit_shovel_mgmt.hrl").
@@ -30,8 +31,9 @@ filter_vhost_user(List, _ReqData, #context{user = User = #user{tags = Tags}}) ->
3031
end].
3132

3233
status(ReqData, Context) ->
34+
Statuses = lists:append([status(Node) || Node <- [node() | nodes()]]),
3335
filter_vhost_user(
34-
lists:append([status(Node) || Node <- [node() | nodes()]]),
36+
Statuses,
3537
ReqData, Context).
3638

3739
status(Node) ->

deps/rabbitmq_shovel_management/test/http_SUITE.erl

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,14 @@ groups() ->
5252
init_per_group(static_shovels, Config) ->
5353
rabbit_ct_helpers:log_environment(),
5454
Config1 = rabbit_ct_helpers:set_config(Config, [
55-
{rmq_nodename_suffix, ?MODULE}
55+
{rmq_nodename_suffix, ?MODULE},
56+
{ignored_crashes, [
57+
"server_initiated_close,404",
58+
"writer,send_failed,closed",
59+
"source_queue_down",
60+
"dest_queue_down",
61+
"dependent process"
62+
]}
5663
]),
5764
rabbit_ct_helpers:run_setup_steps(Config1, [
5865
fun configure_shovels/1,
@@ -62,7 +69,14 @@ init_per_group(static_shovels, Config) ->
6269
init_per_group(_Group, Config) ->
6370
rabbit_ct_helpers:log_environment(),
6471
Config1 = rabbit_ct_helpers:set_config(Config, [
65-
{rmq_nodename_suffix, ?MODULE}
72+
{rmq_nodename_suffix, ?MODULE},
73+
{ignored_crashes, [
74+
"server_initiated_close,404",
75+
"writer,send_failed,closed",
76+
"source_queue_down",
77+
"dest_queue_down",
78+
"dependent process"
79+
]}
6680
]),
6781
rabbit_ct_helpers:run_setup_steps(Config1, [
6882
fun start_inets/1

0 commit comments

Comments
 (0)