diff options
author | Péter Dimitrov <[email protected]> | 2019-06-28 10:26:11 +0200 |
---|---|---|
committer | Péter Dimitrov <[email protected]> | 2019-06-28 10:26:11 +0200 |
commit | 42ab20bfe6cfaf7e08b97ba0fbfffa86da6dc821 (patch) | |
tree | 66f43bce390e2e3a0424161e3824e50bec51c736 /lib/ssl/test/ssl_basic_SUITE.erl | |
parent | 0c463a974b2c7030d13058b8948d1e3a57afe4e6 (diff) | |
parent | adba2f830a495f48e24f8e1fd1bf5c945a3cea05 (diff) | |
download | otp-42ab20bfe6cfaf7e08b97ba0fbfffa86da6dc821.tar.gz otp-42ab20bfe6cfaf7e08b97ba0fbfffa86da6dc821.tar.bz2 otp-42ab20bfe6cfaf7e08b97ba0fbfffa86da6dc821.zip |
Merge branch 'peterdmv/ssl/fix-peername-sockname' into maint
* peterdmv/ssl/fix-peername-sockname:
ssl: Update ssl_test_lib
Diffstat (limited to 'lib/ssl/test/ssl_basic_SUITE.erl')
-rw-r--r-- | lib/ssl/test/ssl_basic_SUITE.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl index f61f688589..bd9d25b3fd 100644 --- a/lib/ssl/test/ssl_basic_SUITE.erl +++ b/lib/ssl/test/ssl_basic_SUITE.erl @@ -1312,14 +1312,14 @@ peername(Config) when is_list(Config) -> {options, [{port, 0} | ClientOpts]}]), ClientPort = ssl_test_lib:inet_port(Client), - ServerIp = ssl_test_lib:node_to_hostip(ServerNode), - ClientIp = ssl_test_lib:node_to_hostip(ClientNode), + ServerIp = ssl_test_lib:node_to_hostip(ServerNode, server), + ClientIp = ssl_test_lib:node_to_hostip(ClientNode, client), ServerMsg = {ok, {ClientIp, ClientPort}}, ClientMsg = {ok, {ServerIp, Port}}, - + ct:log("Testcase ~p, Client ~p Server ~p ~n", [self(), Client, Server]), - + ssl_test_lib:check_result(Server, ServerMsg, Client, ClientMsg), ssl_test_lib:close(Server), @@ -1422,10 +1422,10 @@ sockname(Config) when is_list(Config) -> %% so we can only get a ClientIP, ServerIP will always be 0.0.0.0 {0,0,0,0}; _ -> - ssl_test_lib:node_to_hostip(ServerNode) + ssl_test_lib:node_to_hostip(ServerNode, server) end, - ClientIp = ssl_test_lib:node_to_hostip(ClientNode), + ClientIp = ssl_test_lib:node_to_hostip(ClientNode, client), ServerMsg = {ok, {ServerIp, Port}}, ClientMsg = {ok, {ClientIp, ClientPort}}, |