| commit | f40a753c69e34eae36c11d2744b9f5fef89dc4e0 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Aug 09 15:38:19 2017 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Aug 09 15:38:19 2017 +0000 |
| tree | 939614e5db35a0be0da76f652fff6b1ffe09ff4b | |
| parent | c80fb7cc01e7db5471f55dd306fe0fba255469a8 [diff] | |
| parent | 809148fd5aa36380849c926e74d4f3dea92f138e [diff] |
Merge "Accept failure for spurious server<->server connections."
diff --git a/luni/src/test/java/libcore/javax/net/ssl/SSLSocketTest.java b/luni/src/test/java/libcore/javax/net/ssl/SSLSocketTest.java index 44cda4b..91bd59d 100644 --- a/luni/src/test/java/libcore/javax/net/ssl/SSLSocketTest.java +++ b/luni/src/test/java/libcore/javax/net/ssl/SSLSocketTest.java
@@ -791,7 +791,7 @@ try { test_SSLSocket_setUseClientMode(false, false); fail(); - } catch (SocketTimeoutException expected) { + } catch (SocketTimeoutException|SSLHandshakeException expected) { } }