From cbce95eae12918ad95a2c7d37aed4f1f9bfa3ef5 Mon Sep 17 00:00:00 2001 From: Scott Mitchell Date: Mon, 21 Aug 2017 11:19:47 -0700 Subject: [PATCH] SslHandlerTest#testCompositeBufSizeEstimationGuaranteesSynchronousWrite print SslProvider on failure Motivation: When SslHandlerTest#testCompositeBufSizeEstimationGuaranteesSynchronousWrite fails it would be useful to know the SslProvider type Modifications: - Print the sever and client SslProvider upon failure - Increase test timeout to 8 minutes to allow more time to run Result: Failures include more info to help diagnose issues. --- .../io/netty/handler/ssl/SslHandlerTest.java | 39 +++++++++++-------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/handler/src/test/java/io/netty/handler/ssl/SslHandlerTest.java b/handler/src/test/java/io/netty/handler/ssl/SslHandlerTest.java index a1f81d276f..5e10a6d569 100644 --- a/handler/src/test/java/io/netty/handler/ssl/SslHandlerTest.java +++ b/handler/src/test/java/io/netty/handler/ssl/SslHandlerTest.java @@ -653,7 +653,7 @@ public class SslHandlerTest { } } - @Test(timeout = 300000) + @Test(timeout = 480000) public void testCompositeBufSizeEstimationGuaranteesSynchronousWrite() throws CertificateException, SSLException, ExecutionException, InterruptedException { SslProvider[] providers = SslProvider.values(); @@ -663,22 +663,27 @@ public class SslHandlerTest { for (int j = 0; j < providers.length; ++j) { SslProvider clientProvider = providers[j]; if (isSupported(clientProvider)) { - compositeBufSizeEstimationGuaranteesSynchronousWrite(serverProvider, clientProvider, - true, true, true); - compositeBufSizeEstimationGuaranteesSynchronousWrite(serverProvider, clientProvider, - true, true, false); - compositeBufSizeEstimationGuaranteesSynchronousWrite(serverProvider, clientProvider, - true, false, true); - compositeBufSizeEstimationGuaranteesSynchronousWrite(serverProvider, clientProvider, - true, false, false); - compositeBufSizeEstimationGuaranteesSynchronousWrite(serverProvider, clientProvider, - false, true, true); - compositeBufSizeEstimationGuaranteesSynchronousWrite(serverProvider, clientProvider, - false, true, false); - compositeBufSizeEstimationGuaranteesSynchronousWrite(serverProvider, clientProvider, - false, false, true); - compositeBufSizeEstimationGuaranteesSynchronousWrite(serverProvider, clientProvider, - false, false, false); + try { + compositeBufSizeEstimationGuaranteesSynchronousWrite(serverProvider, clientProvider, + true, true, true); + compositeBufSizeEstimationGuaranteesSynchronousWrite(serverProvider, clientProvider, + true, true, false); + compositeBufSizeEstimationGuaranteesSynchronousWrite(serverProvider, clientProvider, + true, false, true); + compositeBufSizeEstimationGuaranteesSynchronousWrite(serverProvider, clientProvider, + true, false, false); + compositeBufSizeEstimationGuaranteesSynchronousWrite(serverProvider, clientProvider, + false, true, true); + compositeBufSizeEstimationGuaranteesSynchronousWrite(serverProvider, clientProvider, + false, true, false); + compositeBufSizeEstimationGuaranteesSynchronousWrite(serverProvider, clientProvider, + false, false, true); + compositeBufSizeEstimationGuaranteesSynchronousWrite(serverProvider, clientProvider, + false, false, false); + } catch (Throwable cause) { + throw new RuntimeException("serverProvider: " + serverProvider + " clientProvider: " + + clientProvider, cause); + } } } }