aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2014-03-26 09:36:26 +0100
committerIngela Anderton Andin <[email protected]>2014-03-26 09:36:26 +0100
commit1728d63eaa2cab40bc7b53c26835605f4b76429f (patch)
treee047fef3604c04800c316da367c612bb1bd121b3
parentfe4bb3563b4f52662cdf16c3b803b6ed255491c4 (diff)
parent5fe297b3193eee2c0c2544b3732bfa8a581ca99b (diff)
downloadotp-1728d63eaa2cab40bc7b53c26835605f4b76429f.tar.gz
otp-1728d63eaa2cab40bc7b53c26835605f4b76429f.tar.bz2
otp-1728d63eaa2cab40bc7b53c26835605f4b76429f.zip
Merge branch 'ia/inets/cuddle-tests'
* ia/inets/cuddle-tests: inets: Remove potential windows problem
-rw-r--r--lib/inets/test/inets_sup_SUITE.erl15
1 files changed, 4 insertions, 11 deletions
diff --git a/lib/inets/test/inets_sup_SUITE.erl b/lib/inets/test/inets_sup_SUITE.erl
index 12b85a816f..cf28f5a245 100644
--- a/lib/inets/test/inets_sup_SUITE.erl
+++ b/lib/inets/test/inets_sup_SUITE.erl
@@ -260,10 +260,10 @@ tftpd_worker(suite) ->
[];
tftpd_worker(Config) when is_list(Config) ->
[] = supervisor:which_children(tftp_sup),
- {ok, Pid0} = inets:start(tftpd, [{host, "localhost"},
- {port, inet_port()}]),
- {ok, _Pid1} = inets:start(tftpd, [{host, "localhost"},
- {port, inet_port()}], stand_alone),
+ {ok, Pid0} = inets:start(tftpd, [{host, inets_test_lib:hostname()},
+ {port, 0}]),
+ {ok, _Pid1} = inets:start(tftpd, [{host, inets_test_lib:hostname()},
+ {port, 0}], stand_alone),
[{_,Pid0, worker, _}] = supervisor:which_children(tftp_sup),
inets:stop(tftpd, Pid0),
@@ -397,13 +397,6 @@ httpc_subtree(Config) when is_list(Config) ->
tsp("httpc_subtree -> done"),
ok.
-inet_port() ->
- {ok, Socket} = gen_tcp:listen(0, [{reuseaddr, true}]),
- {ok, Port} = inet:port(Socket),
- gen_tcp:close(Socket),
- Port.
-
-
tsp(F) ->
tsp(F, []).
tsp(F, A) ->