diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2015-11-24 18:12:53 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2015-11-24 18:12:53 +0300 |
| commit | e07be9a0f52a1c09f6928cb06c27c47f1f3af2bf (patch) | |
| tree | fdcabd8872f76cf0057f82ed01fed9514b8b0f02 /test | |
| parent | 5d45ac7664f82261d9479551e0affe657ede1977 (diff) | |
| download | rabbitmq-server-git-e07be9a0f52a1c09f6928cb06c27c47f1f3af2bf.tar.gz | |
Switch absolute memory watermark values to be in bytes
Fixes #407, references #207, #378, #448.
Diffstat (limited to 'test')
| -rw-r--r-- | test/src/rabbit_tests.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/src/rabbit_tests.erl b/test/src/rabbit_tests.erl index d4072c62c4..b0aaa53b3e 100644 --- a/test/src/rabbit_tests.erl +++ b/test/src/rabbit_tests.erl @@ -3074,8 +3074,8 @@ nop(_, _) -> ok. test_memory_high_watermark() -> %% set vm memory high watermark HWM = vm_memory_monitor:get_vm_memory_high_watermark(), - %% this will trigger an alarm (memory unit is MB) - ok = control_action(set_vm_memory_high_watermark, ["absolute", "2"]), + %% this will trigger an alarm + ok = control_action(set_vm_memory_high_watermark, ["absolute", "200000"]), [{{resource_limit,memory,_},[]}] = rabbit_alarm:get_alarms(), %% reset ok = control_action(set_vm_memory_high_watermark, [float_to_list(HWM)]), |