aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2011-09-22 09:47:42 +0200
committerLukas Larsson <[email protected]>2011-09-29 17:31:28 +0200
commit9b2b8c8652032c216c4f14d54fa24a2492c8325b (patch)
treefd903d3014d7814d8f058bc86eec6231a1b1b536 /lib/common_test
parent702505ef8a077b07ec9cb4845bb780d4c68e22ec (diff)
downloadotp-9b2b8c8652032c216c4f14d54fa24a2492c8325b.tar.gz
otp-9b2b8c8652032c216c4f14d54fa24a2492c8325b.tar.bz2
otp-9b2b8c8652032c216c4f14d54fa24a2492c8325b.zip
Extend slave start timeout for windows tests
Diffstat (limited to 'lib/common_test')
-rw-r--r--lib/common_test/test/ct_test_support.erl6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/common_test/test/ct_test_support.erl b/lib/common_test/test/ct_test_support.erl
index 31381abc40..e85e8e6ad3 100644
--- a/lib/common_test/test/ct_test_support.erl
+++ b/lib/common_test/test/ct_test_support.erl
@@ -25,6 +25,7 @@
-include_lib("test_server/include/test_server.hrl").
-include_lib("common_test/include/ct_event.hrl").
+-include_lib("common_test/include/ct.hrl").
-export([init_per_suite/1, init_per_suite/2, end_per_suite/1,
init_per_testcase/2, end_per_testcase/2,
@@ -46,9 +47,10 @@ init_per_suite(Config) ->
init_per_suite(Config, Level) ->
case os:type() of
{win32, _} ->
- %% Extend timeout for windows as starting node
+ %% Extend timeout to 1 hour for windows as starting node
%% can take a long time there
- test_server:timetrap( 120000 * test_server:timetrap_scale_factor());
+ test_server:timetrap( 60*60*1000 *
+ test_server:timetrap_scale_factor());
_ ->
ok
end,