diff options
| author | Kenny Root <kroot@google.com> | 2014-05-08 18:09:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-08 18:09:22 +0000 |
| commit | 463f35058d2e80ace9ad85d3d0aa05fd59567d9d (patch) | |
| tree | 9d7f113e651a64fa6676823d09ef0923ec71e185 /luni/src | |
| parent | 2cbfef72ec2046d77d983bc106a3cfb3d69e9bf0 (diff) | |
| parent | 80e731591eda358739d43ffaa2d22635e1ab9fdb (diff) | |
| download | libcore-463f35058d2e80ace9ad85d3d0aa05fd59567d9d.zip libcore-463f35058d2e80ace9ad85d3d0aa05fd59567d9d.tar.gz libcore-463f35058d2e80ace9ad85d3d0aa05fd59567d9d.tar.bz2 | |
am 80e73159: Merge "SSLSocketTest: fix some flaky tests"
* commit '80e731591eda358739d43ffaa2d22635e1ab9fdb':
SSLSocketTest: fix some flaky tests
Diffstat (limited to 'luni/src')
| -rw-r--r-- | luni/src/test/java/libcore/javax/net/ssl/SSLSocketTest.java | 4 |
1 files changed, 3 insertions, 1 deletions
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 2911b48..c3bcd25 100644 --- a/luni/src/test/java/libcore/javax/net/ssl/SSLSocketTest.java +++ b/luni/src/test/java/libcore/javax/net/ssl/SSLSocketTest.java @@ -686,9 +686,10 @@ public class SSLSocketTest extends TestCase { } catch (SSLHandshakeException expected) { assertTrue(expected.getCause() instanceof CertificateException); } + future.get(); client.close(); server.close(); - future.get(); + c.close(); } public void test_SSLSocket_clientAuth() throws Exception { @@ -821,6 +822,7 @@ public class SSLSocketTest extends TestCase { @Override public Void call() throws Exception { try { server.startHandshake(); + fail(); } catch (SSLHandshakeException expected) { } return null; |