aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/test
diff options
context:
space:
mode:
authorAnton N Ryabkov <[email protected]>2017-04-24 13:41:59 +0700
committerAnton N Ryabkov <[email protected]>2017-05-02 08:34:17 +0700
commit38294da512781e44b44b9331bf613003397d529b (patch)
treeb4b927dea780ad6f1542372c05d106b64ad1afb8 /lib/stdlib/test
parent063bebc88358f66cea17e3cf777b8b561a5f14c0 (diff)
downloadotp-38294da512781e44b44b9331bf613003397d529b.tar.gz
otp-38294da512781e44b44b9331bf613003397d529b.tar.bz2
otp-38294da512781e44b44b9331bf613003397d529b.zip
"auto_hibernate_timeout" option renamed to "hibernate_after".
It was done because "hibernate_after" option already used in ssl for the same reason.
Diffstat (limited to 'lib/stdlib/test')
-rw-r--r--lib/stdlib/test/gen_event_SUITE.erl12
-rw-r--r--lib/stdlib/test/gen_fsm_SUITE.erl12
-rw-r--r--lib/stdlib/test/gen_server_SUITE.erl12
-rw-r--r--lib/stdlib/test/gen_statem_SUITE.erl12
4 files changed, 24 insertions, 24 deletions
diff --git a/lib/stdlib/test/gen_event_SUITE.erl b/lib/stdlib/test/gen_event_SUITE.erl
index ca7d5cd59f..290c77520e 100644
--- a/lib/stdlib/test/gen_event_SUITE.erl
+++ b/lib/stdlib/test/gen_event_SUITE.erl
@@ -307,12 +307,12 @@ hibernate(Config) when is_list(Config) ->
ok.
auto_hibernate(Config) when is_list(Config) ->
- AutoHibernateTimeout = 100,
+ HibernateAfterTimeout = 100,
State = {auto_hibernate_state},
- {ok,Pid} = gen_event:start({local, auto_hibernate_handler}, [{auto_hibernate_timeout, AutoHibernateTimeout}]),
+ {ok,Pid} = gen_event:start({local, auto_hibernate_handler}, [{hibernate_after, HibernateAfterTimeout}]),
%% After init test
is_not_in_erlang_hibernate(Pid),
- timer:sleep(AutoHibernateTimeout),
+ timer:sleep(HibernateAfterTimeout),
is_in_erlang_hibernate(Pid),
ok = gen_event:add_handler(auto_hibernate_handler, dummy_h, [State]),
%% Get state test
@@ -321,7 +321,7 @@ auto_hibernate(Config) when is_list(Config) ->
%% Call test
{ok, hejhopp} = gen_event:call(auto_hibernate_handler, dummy_h, hejsan),
is_not_in_erlang_hibernate(Pid),
- timer:sleep(AutoHibernateTimeout),
+ timer:sleep(HibernateAfterTimeout),
is_in_erlang_hibernate(Pid),
%% Event test
ok = gen_event:notify(auto_hibernate_handler, {self(), handle_event}),
@@ -332,7 +332,7 @@ auto_hibernate(Config) when is_list(Config) ->
ct:fail(event)
end,
is_not_in_erlang_hibernate(Pid),
- timer:sleep(AutoHibernateTimeout),
+ timer:sleep(HibernateAfterTimeout),
is_in_erlang_hibernate(Pid),
%% Info test
Pid ! {self(), handle_info},
@@ -343,7 +343,7 @@ auto_hibernate(Config) when is_list(Config) ->
ct:fail(info)
end,
is_not_in_erlang_hibernate(Pid),
- timer:sleep(AutoHibernateTimeout),
+ timer:sleep(HibernateAfterTimeout),
is_in_erlang_hibernate(Pid),
ok = gen_event:stop(auto_hibernate_handler),
ok.
diff --git a/lib/stdlib/test/gen_fsm_SUITE.erl b/lib/stdlib/test/gen_fsm_SUITE.erl
index 03a30c7e6b..b51bf9ce6a 100644
--- a/lib/stdlib/test/gen_fsm_SUITE.erl
+++ b/lib/stdlib/test/gen_fsm_SUITE.erl
@@ -703,12 +703,12 @@ hibernate(Config) when is_list(Config) ->
%% Auto hibernation
auto_hibernate(Config) when is_list(Config) ->
OldFl = process_flag(trap_exit, true),
- AutoHibernateTimeout = 100,
+ HibernateAfterTimeout = 100,
State = {auto_hibernate_state},
- {ok, Pid} = gen_fsm:start_link({local, my_test_name_auto_hibernate}, ?MODULE, {state_data, State}, [{auto_hibernate_timeout, AutoHibernateTimeout}]),
+ {ok, Pid} = gen_fsm:start_link({local, my_test_name_auto_hibernate}, ?MODULE, {state_data, State}, [{hibernate_after, HibernateAfterTimeout}]),
%% After init test
is_not_in_erlang_hibernate(Pid),
- timer:sleep(AutoHibernateTimeout),
+ timer:sleep(HibernateAfterTimeout),
is_in_erlang_hibernate(Pid),
%% Get state test
{_, State} = sys:get_state(my_test_name_auto_hibernate),
@@ -716,19 +716,19 @@ auto_hibernate(Config) when is_list(Config) ->
%% Sync send event test
'alive!' = gen_fsm:sync_send_event(Pid,'alive?'),
is_not_in_erlang_hibernate(Pid),
- timer:sleep(AutoHibernateTimeout),
+ timer:sleep(HibernateAfterTimeout),
is_in_erlang_hibernate(Pid),
%% Send event test
ok = gen_fsm:send_all_state_event(Pid,{'alive?', self()}),
wfor(yes),
is_not_in_erlang_hibernate(Pid),
- timer:sleep(AutoHibernateTimeout),
+ timer:sleep(HibernateAfterTimeout),
is_in_erlang_hibernate(Pid),
%% Info test
Pid ! {self(), handle_info},
wfor({Pid, handled_info}),
is_not_in_erlang_hibernate(Pid),
- timer:sleep(AutoHibernateTimeout),
+ timer:sleep(HibernateAfterTimeout),
is_in_erlang_hibernate(Pid),
stop_it(Pid),
receive
diff --git a/lib/stdlib/test/gen_server_SUITE.erl b/lib/stdlib/test/gen_server_SUITE.erl
index 63dbc41557..c4cd0632d5 100644
--- a/lib/stdlib/test/gen_server_SUITE.erl
+++ b/lib/stdlib/test/gen_server_SUITE.erl
@@ -732,14 +732,14 @@ hibernate(Config) when is_list(Config) ->
auto_hibernate(Config) when is_list(Config) ->
OldFl = process_flag(trap_exit, true),
- AutoHibernateTimeout = 100,
+ HibernateAfterTimeout = 100,
State = {auto_hibernate_state},
{ok, Pid} =
gen_server:start_link({local, my_test_name_auto_hibernate},
- gen_server_SUITE, {state,State}, [{auto_hibernate_timeout, AutoHibernateTimeout}]),
+ gen_server_SUITE, {state,State}, [{hibernate_after, HibernateAfterTimeout}]),
%% After init test
is_not_in_erlang_hibernate(Pid),
- timer:sleep(AutoHibernateTimeout),
+ timer:sleep(HibernateAfterTimeout),
is_in_erlang_hibernate(Pid),
%% Get state test
State = sys:get_state(my_test_name_auto_hibernate),
@@ -747,7 +747,7 @@ auto_hibernate(Config) when is_list(Config) ->
%% Call test
ok = gen_server:call(my_test_name_auto_hibernate, started_p),
is_not_in_erlang_hibernate(Pid),
- timer:sleep(AutoHibernateTimeout),
+ timer:sleep(HibernateAfterTimeout),
is_in_erlang_hibernate(Pid),
%% Cast test
ok = gen_server:cast(my_test_name_auto_hibernate, {self(),handle_cast}),
@@ -758,7 +758,7 @@ auto_hibernate(Config) when is_list(Config) ->
ct:fail(cast)
end,
is_not_in_erlang_hibernate(Pid),
- timer:sleep(AutoHibernateTimeout),
+ timer:sleep(HibernateAfterTimeout),
is_in_erlang_hibernate(Pid),
%% Info test
Pid ! {self(),handle_info},
@@ -769,7 +769,7 @@ auto_hibernate(Config) when is_list(Config) ->
ct:fail(info)
end,
is_not_in_erlang_hibernate(Pid),
- timer:sleep(AutoHibernateTimeout),
+ timer:sleep(HibernateAfterTimeout),
is_in_erlang_hibernate(Pid),
ok = gen_server:call(my_test_name_auto_hibernate, stop),
diff --git a/lib/stdlib/test/gen_statem_SUITE.erl b/lib/stdlib/test/gen_statem_SUITE.erl
index f05fc19555..33441c75e0 100644
--- a/lib/stdlib/test/gen_statem_SUITE.erl
+++ b/lib/stdlib/test/gen_statem_SUITE.erl
@@ -1287,14 +1287,14 @@ hibernate(Config) ->
%% Auto-hibernation timeout
auto_hibernate(Config) ->
OldFl = process_flag(trap_exit, true),
- AutoHibernateTimeout = 100,
+ HibernateAfterTimeout = 100,
{ok,Pid} =
gen_statem:start_link(
- ?MODULE, start_arg(Config, []), [{auto_hibernate_timeout, AutoHibernateTimeout}]),
+ ?MODULE, start_arg(Config, []), [{hibernate_after, HibernateAfterTimeout}]),
%% After init test
is_not_in_erlang_hibernate(Pid),
- timer:sleep(AutoHibernateTimeout),
+ timer:sleep(HibernateAfterTimeout),
is_in_erlang_hibernate(Pid),
%% After info test
Pid ! {hping, self()},
@@ -1305,7 +1305,7 @@ auto_hibernate(Config) ->
ct:fail(info)
end,
is_not_in_erlang_hibernate(Pid),
- timer:sleep(AutoHibernateTimeout),
+ timer:sleep(HibernateAfterTimeout),
is_in_erlang_hibernate(Pid),
%% After cast test
ok = gen_statem:cast(Pid, {hping, self()}),
@@ -1316,12 +1316,12 @@ auto_hibernate(Config) ->
ct:fail(cast)
end,
is_not_in_erlang_hibernate(Pid),
- timer:sleep(AutoHibernateTimeout),
+ timer:sleep(HibernateAfterTimeout),
is_in_erlang_hibernate(Pid),
%% After call test
hpong = gen_statem:call(Pid, hping),
is_not_in_erlang_hibernate(Pid),
- timer:sleep(AutoHibernateTimeout),
+ timer:sleep(HibernateAfterTimeout),
is_in_erlang_hibernate(Pid),
stop_it(Pid),