summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Sébastien Pédron <jean-sebastien@rabbitmq.com>2019-04-15 12:02:59 +0200
committerJean-Sébastien Pédron <jean-sebastien@rabbitmq.com>2019-04-15 12:02:59 +0200
commitddb96a813306758c2b4fa86cf7eb064290b09d86 (patch)
tree7b223323ab65ee4be5de8c665544bf93929abf3a
parent35bc1cd98c3d9033103fac630b838a8296319459 (diff)
downloadrabbitmq-server-git-ddb96a813306758c2b4fa86cf7eb064290b09d86.tar.gz
clustering_management_SUITE: Support 3.7.x status format as well
... so that `status_with_alarm` works in a mixed-versions cluster situation.
-rw-r--r--test/clustering_management_SUITE.erl8
1 files changed, 6 insertions, 2 deletions
diff --git a/test/clustering_management_SUITE.erl b/test/clustering_management_SUITE.erl
index 083e69539b..e85c71c2f3 100644
--- a/test/clustering_management_SUITE.erl
+++ b/test/clustering_management_SUITE.erl
@@ -871,7 +871,11 @@ alarm_information_on_each_node(Output, Rabbit, Hare) ->
{value, Status, _} = erl_eval:exprs(Exprs, erl_eval:new_bindings()),
Alarms = proplists:get_value(alarms, Status),
- ?assert(lists:member({Rabbit, [{resource_limit, memory, Rabbit}]}, Alarms)),
- ?assert(lists:member({Hare, [{resource_limit, disk, Hare}]}, Alarms)),
+ ?assert(
+ lists:member({Rabbit, [memory]}, Alarms) orelse
+ lists:member({Rabbit, [{resource_limit, memory, Rabbit}]}, Alarms)),
+ ?assert(
+ lists:member({Hare, [disk]}, Alarms) orelse
+ lists:member({Hare, [{resource_limit, disk, Hare}]}, Alarms)),
ok.