diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2017-07-11 04:34:32 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2017-07-11 04:34:32 +0300 |
| commit | 26a1ade4bfff245a00936c4e74953c45bb54e784 (patch) | |
| tree | 9ed476aba228d971e3bf673a84215297b55a9cb9 /test | |
| parent | 6967bb30cec8af59e76bcbe098dd0e959c09eacc (diff) | |
| download | rabbitmq-server-git-26a1ade4bfff245a00936c4e74953c45bb54e784.tar.gz | |
Simplify
This code runs on server nodes, we can avoid
using ctl commands.
Diffstat (limited to 'test')
| -rw-r--r-- | test/unit_inbroker_parallel_SUITE.erl | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/test/unit_inbroker_parallel_SUITE.erl b/test/unit_inbroker_parallel_SUITE.erl index 83b9d269c1..b143074f40 100644 --- a/test/unit_inbroker_parallel_SUITE.erl +++ b/test/unit_inbroker_parallel_SUITE.erl @@ -1499,21 +1499,18 @@ set_disk_free_limit_command(Config) -> ?MODULE, set_disk_free_limit_command1, [Config]). set_disk_free_limit_command1(_Config) -> - ok = control_action(set_disk_free_limit, - ["2000kiB"]), + rabbit_disk_monitor:set_disk_free_limit("2000kiB"), 2048000 = rabbit_disk_monitor:get_disk_free_limit(), %% Use an integer - ok = control_action(set_disk_free_limit, - ["mem_relative", "1"]), + rabbit_disk_monitor:set_disk_free_limit({mem_relative, 1}), disk_free_limit_to_total_memory_ratio_is(1), %% Use a float - ok = control_action(set_disk_free_limit, - ["mem_relative", "1.5"]), + rabbit_disk_monitor:set_disk_free_limit({mem_relative, 1.5}), disk_free_limit_to_total_memory_ratio_is(1.5), - ok = control_action(set_disk_free_limit, ["50MB"]), + rabbit_disk_monitor:set_disk_free_limit("50MB"), passed. disk_free_limit_to_total_memory_ratio_is(MemRatio) -> @@ -1527,10 +1524,10 @@ set_vm_memory_high_watermark_command(Config) -> ?MODULE, set_vm_memory_high_watermark_command1, [Config]). set_vm_memory_high_watermark_command1(_Config) -> - MemLimitRatio = "1.0", + MemLimitRatio = 1.0, MemTotal = vm_memory_monitor:get_total_memory(), - ok = control_action(set_vm_memory_high_watermark, [MemLimitRatio]), + vm_memory_monitor:set_vm_memory_high_watermark(MemLimitRatio), MemLimit = vm_memory_monitor:get_memory_limit(), case MemLimit of MemTotal -> ok; |