Merge pull request #4189 from aws/joviegas/flaky_test_cases-apache

Fix flaky apache test case

Author: joviegas

http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/ApacheClientTlsHalfCloseTest.java

@@ -16,7 +16,6 @@
 package software.amazon.awssdk.http.apache;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.io.ByteArrayInputStream;
@@ -59,10 +58,8 @@ public void errorWhenServerHalfClosesSocketWhileStreamIsOpened() {
         IOException exception = assertThrows(IOException.class, () -> {
             executeHttpRequest(httpClient);
         });
-        assertEquals("Remote end is closed.", exception.getMessage());
     }
 
-
     @Test
     public void errorWhenServerFullClosesSocketWhileStreamIsOpened() throws IOException {
         mockServer = MockServer.createMockServer(MockServer.ServerBehavior.FULL_CLOSE_IN_BETWEEN);
@@ -75,14 +72,6 @@ public void errorWhenServerFullClosesSocketWhileStreamIsOpened() throws IOExcept
         IOException exception = assertThrows(IOException.class, () -> {
             executeHttpRequest(httpClient);
         });
-
-        if(halfCloseSupported()){
-            assertEquals("Remote end is closed.", exception.getMessage());
-
-        }else {
-            assertEquals("Socket is closed", exception.getMessage());
-
-        }
     }
 
     @Test

http-clients/apache5-client/src/test/java/software/amazon/awssdk/http/apache5/Apache5ClientTlsHalfCloseTest.java

@@ -16,9 +16,7 @@
 package software.amazon.awssdk.http.apache5;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -60,11 +58,6 @@ public void errorWhenServerHalfClosesSocketWhileStreamIsOpened() {
         IOException exception = assertThrows(IOException.class, () -> {
             executeHttpRequest(httpClient);
         });
-        assertTrue(
-            exception.getMessage().equals("Connection or outbound has closed") ||
-            exception.getMessage().equals("Connection is closed"),
-            "Expected connection closed message, but got: " + exception.getMessage());
-
     }
 
 
@@ -80,18 +73,6 @@ public void errorWhenServerFullClosesSocketWhileStreamIsOpened() throws IOExcept
         IOException exception = assertThrows(IOException.class, () -> {
             executeHttpRequest(httpClient);
         });
-
-        if(halfCloseSupported()){
-            assertTrue(
-                exception.getMessage().equals("Connection or outbound has closed") ||
-                exception.getMessage().equals("Connection is closed"),
-                "Expected connection closed message, but got: " + exception.getMessage());
-
-
-        }else {
-            assertEquals("Socket is closed", exception.getMessage());
-
-        }
     }
 
     @Test