Skip to content

Commit 97936e5

Browse files
dcorbachomergify[bot]
authored andcommitted
Tests: sort nested proplists
(cherry picked from commit 081dee8)
1 parent 071283e commit 97936e5

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

deps/rabbitmq_management/test/listener_config_SUITE.erl

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ tcp_config_only(_Config) ->
7373
]},
7474
{port, 999}
7575
],
76-
?assertEqual(lists:usort(Expected), get_single_listener_config()).
76+
?assertEqual(sort_nested(Expected), sort_nested(get_single_listener_config())).
7777

7878
ssl_config_only(_Config) ->
7979
application:set_env(rabbitmq_management, ssl_config, [
@@ -92,7 +92,7 @@ ssl_config_only(_Config) ->
9292
{idle_timeout, 10000}
9393
]}
9494
],
95-
?assertEqual(lists:usort(Expected), get_single_listener_config()).
95+
?assertEqual(sort_nested(Expected), sort_nested(get_single_listener_config())).
9696

9797
multiple_listeners(_Config) ->
9898
application:set_env(rabbitmq_management, tcp_config, [
@@ -126,9 +126,18 @@ multiple_listeners(_Config) ->
126126
]}
127127
]
128128
],
129-
?assertEqual(lists:usort(Expected), rabbit_mgmt_app:get_listeners_config()).
129+
?assertEqual(sort_nested(Expected), sort_nested(rabbit_mgmt_app:get_listeners_config())).
130130

131131

132132
get_single_listener_config() ->
133133
[Config] = rabbit_mgmt_app:get_listeners_config(),
134134
lists:usort(Config).
135+
136+
sort_nested(Proplist) when is_list(Proplist) ->
137+
lists:usort(lists:map(fun({K, V}) when is_list(V) ->
138+
{K, lists:usort(V)};
139+
(Any) ->
140+
sort_nested(Any)
141+
end, Proplist));
142+
sort_nested(Value) ->
143+
Value.

0 commit comments

Comments
 (0)