aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/test/ssl_to_openssl_SUITE.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2015-12-09 15:14:51 +0100
committerIngela Anderton Andin <[email protected]>2015-12-09 15:47:34 +0100
commita609e31025b2b93d5d360879193eb6f1dac90d51 (patch)
treedc7018c665aac7258035bd8e142a40ca01ad4463 /lib/ssl/test/ssl_to_openssl_SUITE.erl
parent22afaebfc419df5a0ca78340ffc659f72439e2db (diff)
downloadotp-a609e31025b2b93d5d360879193eb6f1dac90d51.tar.gz
otp-a609e31025b2b93d5d360879193eb6f1dac90d51.tar.bz2
otp-a609e31025b2b93d5d360879193eb6f1dac90d51.zip
ssl: Use test case time out instead
Diffstat (limited to 'lib/ssl/test/ssl_to_openssl_SUITE.erl')
-rw-r--r--lib/ssl/test/ssl_to_openssl_SUITE.erl4
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/ssl/test/ssl_to_openssl_SUITE.erl b/lib/ssl/test/ssl_to_openssl_SUITE.erl
index 52b078f27b..67045043cf 100644
--- a/lib/ssl/test/ssl_to_openssl_SUITE.erl
+++ b/lib/ssl/test/ssl_to_openssl_SUITE.erl
@@ -1257,7 +1257,7 @@ client_check_result(Port, DataExpected, DataReceived) ->
client_check_result(Port, DataExpected, NewData)
end
after 3000 ->
- ct:fail({"Time out on opensssl Client", {expected, DataExpected},
+ ct:fail({"Time out on openSSL Client", {expected, DataExpected},
{got, DataReceived}})
end.
client_check_result(Port, DataExpected) ->
@@ -1675,8 +1675,6 @@ erlang_ssl_receive(Socket, Data) ->
erlang_ssl_receive(Socket,Data);
Other ->
ct:fail({unexpected_message, Other})
- after 4000 ->
- ct:fail({did_not_get, Data})
end.
connection_info(Socket, Version) ->