aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2010-12-03 14:58:38 +0100
committerLukas Larsson <[email protected]>2010-12-03 14:58:38 +0100
commit52b0fbbc4daa4e22fcad6fe39dd8f8cec8bb8d1b (patch)
tree2ac7cdb72189794e1d2600190af148db0b8f4779
parent74ec1253e1a89f0bb266831f73716a24c0798dc1 (diff)
parent5bc0e21b553ac256c31dfce920c7e5b9802754ad (diff)
downloadotp-52b0fbbc4daa4e22fcad6fe39dd8f8cec8bb8d1b.tar.gz
otp-52b0fbbc4daa4e22fcad6fe39dd8f8cec8bb8d1b.tar.bz2
otp-52b0fbbc4daa4e22fcad6fe39dd8f8cec8bb8d1b.zip
Merge branch 'lukas/common_test/extend_timeout_for_win' into dev
* lukas/common_test/extend_timeout_for_win: Update the support init_per_suite to extend the timeout for starting a slave node on windows.
-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 b0c98e7f7f..5e9792f02c 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);