diff options
Diffstat (limited to 'lib/kernel/test/application_SUITE.erl')
| -rw-r--r-- | lib/kernel/test/application_SUITE.erl | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/lib/kernel/test/application_SUITE.erl b/lib/kernel/test/application_SUITE.erl index 3584b90378..0668c28692 100644 --- a/lib/kernel/test/application_SUITE.erl +++ b/lib/kernel/test/application_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2020. All Rights Reserved. +%% Copyright Ericsson AB 1996-2022. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -225,7 +225,7 @@ failover(Conf) when is_list(Conf) -> %%----------------------------------------------------------------- %% Tests failover and takeover for distributed applications. Tests %% start, load etc implicitly. The applications do not use start_phases -%% i.e. the failover should be transfered to normal start type. +%% i.e. the failover should be transferred to normal start type. failover_comp(Conf) when is_list(Conf) -> %% start a help process to check the start type StPid = spawn_link(?MODULE, start_type, []), @@ -371,7 +371,7 @@ permissions(Conf) when is_list(Conf) -> false = is_started(app1, Cp3), true = is_started(app1, Cp2), - %% Start app3, make sure noone starts it + %% Start app3, make sure no one starts it {[ok,ok,ok],[]} = rpc:multicall(Cps, application, load, [app3()]), ?UNTIL(is_loaded(app3, Cps)), @@ -744,7 +744,7 @@ permit_false_start_local(Conf) when is_list(Conf) -> true = is_started(app1, Cp2), false = is_started(app1, Cp3), - %% Unpermit it agin + %% Unpermit it again ok = rpc:call(Cp1, application, permit, [app1, false]), ct:sleep(1000), false = is_started(app1, Cp1), @@ -1225,7 +1225,7 @@ otp_2718(Conf) when is_list(Conf) -> %% Ticket: OTP-2973 %% Slogan: application:start does not test if an appl is already starting... %%----------------------------------------------------------------- -%% Test of two processes simultanously starting the same application. +%% Test of two processes simultaneously starting the same application. otp_2973(Conf) when is_list(Conf) -> %% Write a .app file {ok, Fd} = file:open("app0.app", [write]), @@ -2188,10 +2188,9 @@ do_configfd_test_bash() -> "3> /dev/null ")), %% Check that file descriptor with a huge amount of data fails case application:start(os_mon) of - ok -> case proplists:get_value(system_total_memory, - memsup:get_system_memory_data()) of + ok -> case total_memory() of Memory when is_integer(Memory), - Memory > 16*1024*1024*1024 -> + Memory > 16 -> application:stop(os_mon), true = ("magic42" =/= @@ -2210,6 +2209,22 @@ do_configfd_test_bash() -> end, ok. +total_memory() -> + %% Total memory in GB. + try + SMD = memsup:get_system_memory_data(), + TM = proplists:get_value( + available_memory, SMD, + proplists:get_value( + total_memory, SMD, + proplists:get_value( + system_total_memory, SMD))), + TM div (1024*1024*1024) + catch + _ : _ -> + undefined + end. + %% Test that one can get configuration from file descriptor with the %% -configfd option configfd_bash(Conf) when is_list(Conf) -> |