aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2013-01-21 16:36:22 +0100
committerLukas Larsson <[email protected]>2013-01-21 16:36:22 +0100
commit67c18614b81183cc74446a8a1e8bba88b74c4034 (patch)
treefb0e27ed8f9b7e8fba3deda34d1789ea6586509f
parentc6583fdcadb0c13a0b5b6dd82af4dcb51ac64822 (diff)
parent349101341da65b20bea9254a4deb44c7f89dc7eb (diff)
downloadotp-67c18614b81183cc74446a8a1e8bba88b74c4034.tar.gz
otp-67c18614b81183cc74446a8a1e8bba88b74c4034.tar.bz2
otp-67c18614b81183cc74446a8a1e8bba88b74c4034.zip
Merge branch 'lukas/kernel/iter_max_socks_to_node/OTP-10734'
* lukas/kernel/iter_max_socks_to_node/OTP-10734: Isolate iter_max_socks to own node
-rw-r--r--lib/kernel/test/gen_tcp_misc_SUITE.erl10
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/kernel/test/gen_tcp_misc_SUITE.erl b/lib/kernel/test/gen_tcp_misc_SUITE.erl
index 5d45b91ee5..93dc2a69d1 100644
--- a/lib/kernel/test/gen_tcp_misc_SUITE.erl
+++ b/lib/kernel/test/gen_tcp_misc_SUITE.erl
@@ -47,7 +47,7 @@
%% Internal exports.
-export([sender/3, not_owner/1, passive_sockets_server/2, priority_server/1,
- otp_7731_server/1, zombie_server/2]).
+ otp_7731_server/1, zombie_server/2, do_iter_max_socks/2]).
init_per_testcase(_Func, Config) when is_list(Config) ->
Dog = test_server:timetrap(test_server:seconds(240)),
@@ -589,7 +589,13 @@ iter_max_socks(doc) ->
"that we get the same number of sockets every time."];
iter_max_socks(Config) when is_list(Config) ->
N = 20,
- L = do_iter_max_socks(N, initalize),
+ %% 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,
+ [{args,"-pa " ++ Dir}]),
+ L = rpc:call(Node,?MODULE,do_iter_max_socks,[N, initalize]),
+ test_server:stop_node(Node),
+
io:format("Result: ~p",[L]),
all_equal(L),
{comment, "Max sockets: " ++ integer_to_list(hd(L))}.