andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix possible testfailure due not waiting on Channel.close() (introduced by e220c56823)

Browse Source
This commit is contained in:
Norman Maurer 2016-02-05 12:28:11 +01:00
parent 0f3d47199b
commit 0f91ad841d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
handler/src/test/java/io/netty/handler/ssl/SniClientTest.java
View File

@ -35,24 +35,24 @@ import org.junit.Test;
public class SniClientTest { public class SniClientTest {
@Test @Test(timeout = 5000)
public void testSniClientJdkSslServerJdkSsl() throws Exception { public void testSniClientJdkSslServerJdkSsl() throws Exception {
testSniClient(SslProvider.JDK, SslProvider.JDK); testSniClient(SslProvider.JDK, SslProvider.JDK);
} }
@Test @Test(timeout = 5000)
public void testSniClientOpenSslServerOpenSsl() throws Exception { public void testSniClientOpenSslServerOpenSsl() throws Exception {
Assume.assumeTrue(OpenSsl.isAvailable()); Assume.assumeTrue(OpenSsl.isAvailable());
testSniClient(SslProvider.OPENSSL, SslProvider.OPENSSL); testSniClient(SslProvider.OPENSSL, SslProvider.OPENSSL);
} }
@Test @Test(timeout = 5000)
public void testSniClientJdkSslServerOpenSsl() throws Exception { public void testSniClientJdkSslServerOpenSsl() throws Exception {
Assume.assumeTrue(OpenSsl.isAvailable()); Assume.assumeTrue(OpenSsl.isAvailable());
testSniClient(SslProvider.JDK, SslProvider.OPENSSL); testSniClient(SslProvider.JDK, SslProvider.OPENSSL);
} }
@Test @Test(timeout = 5000)
public void testSniClientOpenSslServerJdkSsl() throws Exception { public void testSniClientOpenSslServerJdkSsl() throws Exception {
Assume.assumeTrue(OpenSsl.isAvailable()); Assume.assumeTrue(OpenSsl.isAvailable());
testSniClient(SslProvider.OPENSSL, SslProvider.JDK); testSniClient(SslProvider.OPENSSL, SslProvider.JDK);
@ -93,10 +93,10 @@ public class SniClientTest {
Assert.assertEquals(sniHost, promise.syncUninterruptibly().getNow()); Assert.assertEquals(sniHost, promise.syncUninterruptibly().getNow());
} finally { } finally {
if (cc != null) { if (cc != null) {
cc.close(); cc.close().syncUninterruptibly();
} }
if (sc != null) { if (sc != null) {
sc.close(); sc.close().syncUninterruptibly();
} }
group.shutdownGracefully(); group.shutdownGracefully();
} }