aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2010-12-02 10:34:57 +0100
committerLukas Larsson <[email protected]>2010-12-03 09:50:27 +0100
commit5bc0e21b553ac256c31dfce920c7e5b9802754ad (patch)
tree70011abcfb4f62fb74ed1a7636b722854aa90b8c /lib/common_test
parentf614916f28703dce2067408cb3f5e2850ce9cacb (diff)
downloadotp-5bc0e21b553ac256c31dfce920c7e5b9802754ad.tar.gz
otp-5bc0e21b553ac256c31dfce920c7e5b9802754ad.tar.bz2
otp-5bc0e21b553ac256c31dfce920c7e5b9802754ad.zip
Update the support init_per_suite to extend the timeout for starting a slave node on windows.
Diffstat (limited to 'lib/common_test')
-rw-r--r--lib/common_test/test/ct_test_support.erl10
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/common_test/test/ct_test_support.erl b/lib/common_test/test/ct_test_support.erl
index 7bfb9ffb49..5b9d3d79c3 100644
--- a/lib/common_test/test/ct_test_support.erl
+++ b/lib/common_test/test/ct_test_support.erl
@@ -43,6 +43,14 @@ init_per_suite(Config) ->
init_per_suite(Config, 50).
init_per_suite(Config, Level) ->
+ case os:type() of
+ {win32, _} ->
+ %% Extend timeout for windows as starting node
+ %% can take a long time there
+ test_server:timetrap( 120000 * test_server:timetrap_scale_factor());
+ _ ->
+ ok
+ end,
case delete_old_logs(os:type(), Config) of
{'EXIT',DelLogsReason} ->
test_server:format(0, "Failed to delete old log directories: ~p~n",
@@ -51,6 +59,8 @@ init_per_suite(Config, Level) ->
ok
end,
[_,Host] = string:tokens(atom_to_list(node()), "@"),
+
+ test_server:format(0, "Trying to start ~s~n", ["ct@"++Host]),
case slave:start(Host, ct, []) of
{error,Reason} ->
test_server:fail(Reason);