aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2013-02-25 17:12:10 +0100
committerLukas Larsson <[email protected]>2013-02-25 17:12:26 +0100
commitc717fc6e0d660cb39f09dc079643991559168d40 (patch)
tree49a42682edd2bf0adb763f3c77d439e8bffc2ce4
parent192440ab1fdad0f3924f7af8c6f0dbc4f47f70b1 (diff)
downloadotp-c717fc6e0d660cb39f09dc079643991559168d40.tar.gz
otp-c717fc6e0d660cb39f09dc079643991559168d40.tar.bz2
otp-c717fc6e0d660cb39f09dc079643991559168d40.zip
Update to work with new default windows max ports
-rw-r--r--lib/kernel/test/gen_tcp_misc_SUITE.erl10
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/kernel/test/gen_tcp_misc_SUITE.erl b/lib/kernel/test/gen_tcp_misc_SUITE.erl
index a72e76f813..6b672004ec 100644
--- a/lib/kernel/test/gen_tcp_misc_SUITE.erl
+++ b/lib/kernel/test/gen_tcp_misc_SUITE.erl
@@ -50,6 +50,14 @@
oct_acceptor/1,
otp_7731_server/1, zombie_server/2, do_iter_max_socks/2]).
+init_per_testcase(iter_max_socks, Config) when is_list(Config) ->
+ Dog = case os:type() of
+ {win32,_} ->
+ test_server:timetrap(test_server:minutes(30));
+ _Else ->
+ test_server:timetrap(test_server:seconds(240))
+ end,
+ [{watchdog, Dog}|Config];
init_per_testcase(_Func, Config) when is_list(Config) ->
Dog = test_server:timetrap(test_server:seconds(240)),
[{watchdog, Dog}|Config].
@@ -590,7 +598,7 @@ iter_max_socks(doc) ->
["Open as many sockets as possible. Do this several times and check ",
"that we get the same number of sockets every time."];
iter_max_socks(Config) when is_list(Config) ->
- N = 20,
+ N = case os:type() of {win32,_} -> 10; _ -> 20 end,
%% Run on a different node in order to limit the effect if this test fails.
Dir = filename:dirname(code:which(?MODULE)),
{ok,Node} = test_server:start_node(test_iter_max_socks,slave,