diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-08-22 14:57:36 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-08-22 14:57:36 +0200 |
| commit | 2fa9a7a24966874293b9c7bcabd0354e84ded97d (patch) | |
| tree | 9672a4db523292ff2b222724aa25b332bf733493 /lib/ssl/test/tls_api_SUITE.erl | |
| parent | 44655c3ed728771b791af56efb9188855058c40f (diff) | |
| parent | 2e6c410712847ba3e20819e2c434e675c26e6160 (diff) | |
| download | otp-2fa9a7a24966874293b9c7bcabd0354e84ded97d.tar.gz otp-2fa9a7a24966874293b9c7bcabd0354e84ded97d.tar.bz2 otp-2fa9a7a24966874293b9c7bcabd0354e84ded97d.zip | |
Merge branch 'ingela/ssl/test-cuddle' into maint
* ingela/ssl/test-cuddle:
ssl: Make sure test starts in a "good" state
ssl: Cuddle timeout
Diffstat (limited to 'lib/ssl/test/tls_api_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/tls_api_SUITE.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssl/test/tls_api_SUITE.erl b/lib/ssl/test/tls_api_SUITE.erl index 5a74ec1892..7239d4cb90 100644 --- a/lib/ssl/test/tls_api_SUITE.erl +++ b/lib/ssl/test/tls_api_SUITE.erl @@ -794,16 +794,16 @@ tls_downgrade_result(Socket, Pid) -> {tcp, TCPSocket, <<"Downgraded">>} -> ok; {tcp_closed, TCPSocket} -> - ct:fail("Peer timed out, downgrade aborted"), + ct:fail("Did not receive TCP data"), ok; Other -> {error, Other} end; {error, timeout} -> - ct:fail("Timed out, downgrade aborted"), + ct:comment("Timed out, downgrade aborted"), ok; Fail -> - {error, Fail} + ct:fail(Fail) end. tls_shutdown_result(Socket, server) -> |