diff options
| author | Lukas Larsson <[email protected]> | 2016-06-14 10:22:40 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-06-14 10:22:40 +0200 |
| commit | 1418cbbb689dc2c88ecceaedb4eba33061d338e7 (patch) | |
| tree | 348257a01f32af0ceb349933c4a7dbe64c884df7 /lib/ssl | |
| parent | 0c8357d15dd2573331056a308e3744927ce406ad (diff) | |
| parent | 9411a2098d983cac05fd7198bba26b9d56aa484a (diff) | |
| download | otp-1418cbbb689dc2c88ecceaedb4eba33061d338e7.tar.gz otp-1418cbbb689dc2c88ecceaedb4eba33061d338e7.tar.bz2 otp-1418cbbb689dc2c88ecceaedb4eba33061d338e7.zip | |
Merge branch 'lukas/erts/testfixes-19'
* lukas/erts/testfixes-19:
erts: Increase bif and nif call_time trace test
erts: Fix distribution_SUITE:bulk_send_bigbig on windows
erts: Ensure bs_add_overflow test has enough memory
kernel: Better explain controlling_process' tcp behaviour
kernel: Fix t_recv_delim on bsd
os_mon: Make sure to start/stop os_mon in tests correctly
ssl: Fix use_interface dist_SSL test
erl_interface: Fix signed int overflow tc bug
erts: fix atom_roundtrip_r15b tc
erts: Require more memory for debug tests
Diffstat (limited to 'lib/ssl')
| -rw-r--r-- | lib/ssl/test/ssl_dist_SUITE.erl | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/ssl/test/ssl_dist_SUITE.erl b/lib/ssl/test/ssl_dist_SUITE.erl index f0ce82f4fe..5ebf9bb2de 100644 --- a/lib/ssl/test/ssl_dist_SUITE.erl +++ b/lib/ssl/test/ssl_dist_SUITE.erl @@ -413,7 +413,7 @@ use_interface(Config) when is_list(Config) -> NH1, fun() -> [inet:sockname(P) || - P <- erlang:ports(), + P <- inet_ports(), {ok, Port} =:= (catch inet:port(P))] end), %% And check that it's actually listening on localhost. @@ -705,9 +705,11 @@ try_setting_priority(TestFun, Config) -> get_socket_priorities() -> [Priority || {ok,[{priority,Priority}]} <- - [inet:getopts(Port, [priority]) || - Port <- erlang:ports(), - element(2, erlang:port_info(Port, name)) =:= "tcp_inet"]]. + [inet:getopts(Port, [priority]) || Port <- inet_ports()]]. + +inet_ports() -> + [Port || Port <- erlang:ports(), + element(2, erlang:port_info(Port, name)) =:= "tcp_inet"]. %% %% test_server side api |