aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorAndrey Pampukha <[email protected]>2010-04-13 09:11:59 +0200
committerRaimo Niskanen <[email protected]>2010-06-09 16:19:18 +0200
commit2daac36809c14007d179a118784f48ceb79a30d1 (patch)
treee357965e790cc88a5a8c4dc8d12e5e2cff31a96d /lib
parent05f69de43fc8f95baab30e940cd80df86a433e1e (diff)
downloadotp-2daac36809c14007d179a118784f48ceb79a30d1.tar.gz
otp-2daac36809c14007d179a118784f48ceb79a30d1.tar.bz2
otp-2daac36809c14007d179a118784f48ceb79a30d1.zip
Change monitor_master option to false by default
Diffstat (limited to 'lib')
-rw-r--r--lib/common_test/src/ct_master.erl5
-rw-r--r--lib/common_test/src/ct_slave.erl4
-rw-r--r--lib/common_test/test/ct_master_SUITE.erl3
3 files changed, 6 insertions, 6 deletions
diff --git a/lib/common_test/src/ct_master.erl b/lib/common_test/src/ct_master.erl
index b14e7527e5..ecf516bd98 100644
--- a/lib/common_test/src/ct_master.erl
+++ b/lib/common_test/src/ct_master.erl
@@ -710,12 +710,11 @@ start_nodes([{NodeName, Options}|Rest])->
Host=list_to_atom(HostS),
{value, {callback_module, Callback}, Options2}=
lists:keytake(callback_module, 1, Options),
- io:format("Starting node ~p on host ~p with callback ~p...~n", [Node, Host, Callback]),
case Callback:start(Host, Node, Options2) of
{ok, NodeName} ->
- io:format("Node ~p started successfully~n", [NodeName]);
+ io:format("Node ~p started successfully with callback ~p~n", [NodeName,Callback]);
{error, Reason, _NodeName} ->
- io:format("Failed to start node ~p! Reason: ~p~n", [NodeName, Reason])
+ io:format("Failed to start node ~p with callback ~p! Reason: ~p~n", [NodeName, Callback, Reason])
end,
start_nodes(Rest).
diff --git a/lib/common_test/src/ct_slave.erl b/lib/common_test/src/ct_slave.erl
index 09d8820731..476815895c 100644
--- a/lib/common_test/src/ct_slave.erl
+++ b/lib/common_test/src/ct_slave.erl
@@ -134,7 +134,7 @@ start(Host, Node)->
%%% </list></p>
%%%
%%% <p>Option <code>monitor_master</code> specifies, if the slave node should be
-%%% stopped in case of master node stop. Defaults to true.</p>
+%%% stopped in case of master node stop. Defaults to false.</p>
%%%
%%% <p>Option <code>kill_if_fail</code> specifies, if the slave node should be
%%% killed in case of a timeout during initialization or startup.
@@ -222,7 +222,7 @@ fetch_options(Options)->
InitTimeout = get_option_value(init_timeout, Options, 1),
StartupTimeout = get_option_value(startup_timeout, Options, 1),
StartupFunctions = get_option_value(startup_functions, Options, []),
- Monitor = get_option_value(monitor_master, Options, true),
+ Monitor = get_option_value(monitor_master, Options, false),
KillIfFail = get_option_value(kill_if_fail, Options, true),
ErlFlags = get_option_value(erl_flags, Options, []),
#options{username=UserName, password=Password,
diff --git a/lib/common_test/test/ct_master_SUITE.erl b/lib/common_test/test/ct_master_SUITE.erl
index 3618b08a74..0f0d13f683 100644
--- a/lib/common_test/test/ct_master_SUITE.erl
+++ b/lib/common_test/test/ct_master_SUITE.erl
@@ -99,7 +99,8 @@ make_spec(DataDir, FileName, NodeNames, Suites, Config)->
NodeNames),
NS = lists:map(fun(NodeName)->
- {node_start, NodeName, [{startup_functions, [{io, format, ["hello, world~n"]}]}]}
+ {node_start, NodeName, [{startup_functions, [{io, format, ["hello, world~n"]}]},
+ {monitor_master, true}]}
end,
NodeNames),