summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2012-11-13 12:56:45 +0000
committerMatthias Radestock <matthias@rabbitmq.com>2012-11-13 12:56:45 +0000
commitce92c09c203768593c4e1b7a957d336cd41c1561 (patch)
tree2b3b182130d14de892e69601a2c31275c8d81724
parentd08b0a3b4510b983c0ab682bfee523886d18a29b (diff)
parent0cfaf879a427c252c970e21ec6135ab898672402 (diff)
downloadrabbitmq-server-ce92c09c203768593c4e1b7a957d336cd41c1561.tar.gz
merge heads
-rw-r--r--src/rabbit_tests.erl3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl
index 8a24d388..096f9490 100644
--- a/src/rabbit_tests.erl
+++ b/src/rabbit_tests.erl
@@ -1131,6 +1131,9 @@ test_server_status() ->
HWM = vm_memory_monitor:get_vm_memory_high_watermark(),
ok = control_action(set_vm_memory_high_watermark, ["1"]),
ok = control_action(set_vm_memory_high_watermark, ["1.0"]),
+ %% this will trigger an alarm
+ ok = control_action(set_vm_memory_high_watermark, ["0.0"]),
+ %% reset
ok = control_action(set_vm_memory_high_watermark, [float_to_list(HWM)]),
%% eval