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
commit167b73311d0e38a693d822b4388c76912106a67d (patch)
tree2b3b182130d14de892e69601a2c31275c8d81724
parent68404afcd0341ada064b985598a0c7c90b9bf772 (diff)
parentfddfdf6e311e65af181e52022066e939a8e29001 (diff)
downloadrabbitmq-server-git-167b73311d0e38a693d822b4388c76912106a67d.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 8a24d388e2..096f949061 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