Merge pull request #1210 from fl4via/TEST_FIXES_2.0.x

Test fixes for maintenance branch
undertow-io · Jul 19, 2021 · 046f370 · 046f370
2 parents b6189e4 + 8f51b19
commit 046f370
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/core/src/test/java/io/undertow/server/ParseTimeoutTestCase.java b/core/src/test/java/io/undertow/server/ParseTimeoutTestCase.java
@@ -22,6 +22,7 @@
 import io.undertow.testutils.DefaultServer;
 import io.undertow.testutils.HttpOneOnly;
 import io.undertow.testutils.ProxyIgnore;
+import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -54,6 +55,7 @@ public void before() throws Exception {
         clientInputStream = client.getInputStream();
     }
 
+    @After
     public void after() throws Exception {
         IoUtils.safeClose(client);
         DefaultServer.setUndertowOptions(OptionMap.EMPTY);

diff --git a/core/src/test/java/io/undertow/server/WriteTimeoutTestCase.java b/core/src/test/java/io/undertow/server/WriteTimeoutTestCase.java
@@ -35,23 +35,34 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.xnio.ChannelListener;
+import org.xnio.OptionMap;
 import org.xnio.Options;
 import org.xnio.channels.StreamSinkChannel;
 import org.xnio.channels.WriteTimeoutException;
 
 /**
- * Tests read timeout with a client that is slow to read the response
+ * Tests write timeout with a client that is slow to read the response
  *
  * @author Stuart Douglas
  */
 @RunWith(DefaultServer.class)
 @HttpOneOnly
-@Ignore("This test fails intermittently")
+@Ignore("UNDERTOW-1859 this test freezes") //FIXME
 public class WriteTimeoutTestCase {
 
     private volatile Exception exception;
     private static final CountDownLatch errorLatch = new CountDownLatch(1);
 
+    @DefaultServer.BeforeServerStarts
+    public static void setup() {
+        DefaultServer.setServerOptions(OptionMap.builder().set(Options.WRITE_TIMEOUT, 10).getMap());
+    }
+
+    @DefaultServer.AfterServerStops
+    public static void cleanup() {
+        DefaultServer.setServerOptions(OptionMap.EMPTY);
+    }
+
     @Test
     public void testWriteTimeout() throws IOException, InterruptedException {
         DefaultServer.setRootHandler(new HttpHandler() {

diff --git a/core/src/test/java/io/undertow/server/ssl/ComplexSSLTestCase.java b/core/src/test/java/io/undertow/server/ssl/ComplexSSLTestCase.java
@@ -45,6 +45,7 @@
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.StringEntity;
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -107,6 +108,7 @@ public void complexSSLTestCase() throws IOException, GeneralSecurityException, U
     }
 
     @Test
+    @Ignore // FIXME UNDERTOW-1918
     public void testSslLotsOfData() throws IOException, GeneralSecurityException, URISyntaxException {
 
         DefaultServer.setRootHandler(new HttpHandler() {