diff options
| author | Simon Cornish <[email protected]> | 2016-04-25 22:21:07 -0700 |
|---|---|---|
| committer | Simon Cornish <[email protected]> | 2016-06-01 14:56:24 +0200 |
| commit | 45a4a46333b1e8e6f66ba923deaf947a67ae7737 (patch) | |
| tree | feacad1dc2e8ca4e675aba503eafd20831491ce8 /lib/kernel/test | |
| parent | 523e048754f5086a6cc4fd9a250e1b495fc5b9b8 (diff) | |
| download | otp-45a4a46333b1e8e6f66ba923deaf947a67ae7737.tar.gz otp-45a4a46333b1e8e6f66ba923deaf947a67ae7737.tar.bz2 otp-45a4a46333b1e8e6f66ba923deaf947a67ae7737.zip | |
Don't kill old erlang if HEART_NO_KILL is set
If the environment variable HEART_NO_KILL is set then
heart won't kill the old erlang process. This is desirable
if the command executed by heart takes care of this.
Diffstat (limited to 'lib/kernel/test')
| -rw-r--r-- | lib/kernel/test/heart_SUITE.erl | 40 |
1 files changed, 38 insertions, 2 deletions
diff --git a/lib/kernel/test/heart_SUITE.erl b/lib/kernel/test/heart_SUITE.erl index 39cd29cea0..a848bc78f7 100644 --- a/lib/kernel/test/heart_SUITE.erl +++ b/lib/kernel/test/heart_SUITE.erl @@ -29,11 +29,11 @@ set_cmd/1, clear_cmd/1, get_cmd/1, callback_api/1, options_api/1, - dont_drop/1, kill_pid/1]). + dont_drop/1, kill_pid/1, heart_no_kill/1]). -export([init_per_testcase/2, end_per_testcase/2]). --export([start_heart_stress/1, mangle/1, suicide_by_heart/0]). +-export([start_heart_stress/1, mangle/1, suicide_by_heart/0, non_suicide_by_heart/0]). -define(DEFAULT_TIMEOUT_SECS, 120). @@ -507,6 +507,30 @@ do_kill_pid(_Config) -> false end. + +heart_no_kill(suite) -> + []; +heart_no_kill(doc) -> + ["Tests that heart doesn't kill the old erlang node when ", + "HEART_NO_KILL is set."]; +heart_no_kill(Config) when is_list(Config) -> + ok = do_no_kill(Config). + +do_no_kill(_Config) -> + Name = heart_test, + {ok,Node} = start_node_run(Name,[],non_suicide_by_heart,[]), + io:format("Node is ~p~n", [Node]), + ok = wait_for_node(Node,15), + io:format("wait_for_node is ~p~n", [ok]), + erlang:monitor_node(Node, true), + receive {nodedown,Node} -> false + after 30000 -> + io:format("Node didn't die..\n"), + rpc:call(Node,init,stop,[]), + io:format("done init:stop..\n"), + ok + end. + wait_for_node(_,0) -> false; wait_for_node(Node,N) -> @@ -625,6 +649,18 @@ suicide_by_heart() -> sallad end. +non_suicide_by_heart() -> + P = open_port({spawn,"heart -ht 11 -pid "++os:getpid()},[exit_status, {env, {"HEART_NO_KILL", "1"}}, {packet,2}]), + receive X -> X end, + %% Just hang and wait for heart to timeout + receive + {P,{exit_status,_}} -> + ok + after + 20000 -> + exit(timeout) + end. + %% generate a module from binary generate(Module, Attributes, FunStrings) -> |