@@ -73,7 +73,7 @@ tcp_config_only(_Config) ->
73
73
]},
74
74
{port , 999 }
75
75
],
76
- ? assertEqual (lists : usort (Expected ), get_single_listener_config ()).
76
+ ? assertEqual (sort_nested (Expected ), sort_nested ( get_single_listener_config () )).
77
77
78
78
ssl_config_only (_Config ) ->
79
79
application :set_env (rabbitmq_management , ssl_config , [
@@ -92,7 +92,7 @@ ssl_config_only(_Config) ->
92
92
{idle_timeout , 10000 }
93
93
]}
94
94
],
95
- ? assertEqual (lists : usort (Expected ), get_single_listener_config ()).
95
+ ? assertEqual (sort_nested (Expected ), sort_nested ( get_single_listener_config () )).
96
96
97
97
multiple_listeners (_Config ) ->
98
98
application :set_env (rabbitmq_management , tcp_config , [
@@ -126,9 +126,18 @@ multiple_listeners(_Config) ->
126
126
]}
127
127
]
128
128
],
129
- ? assertEqual (lists : usort (Expected ), rabbit_mgmt_app :get_listeners_config ()).
129
+ ? assertEqual (sort_nested (Expected ), sort_nested ( rabbit_mgmt_app :get_listeners_config () )).
130
130
131
131
132
132
get_single_listener_config () ->
133
133
[Config ] = rabbit_mgmt_app :get_listeners_config (),
134
134
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