fix and include web server test (#273)

Signed-off-by: Filip Drobnjakovic <[email protected]>
opensearch-project · Jan 23, 2023 · b74944a · b74944a
1 parent b825070
commit b74944a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -214,8 +214,6 @@ test {
             excludeTestsMatching 'org.opensearch.performanceanalyzer.rca.integTests.*'
             // TODO: Fix this test as it causes OutOfMemoryError: Java heap space error and runs forever
             excludeTestsMatching 'org.opensearch.performanceanalyzer.reader.OSMetricsSnapshotTests'
-            // TODO: Fix flaky test: https://github.com/opensearch-project/performance-analyzer-rca/issues/167
-            excludeTestsMatching 'org.opensearch.performanceanalyzer.PerformanceAnalyzerWebServerTest'
         }
     }
     else {

diff --git a/src/test/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerWebServerTest.java b/src/test/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerWebServerTest.java
@@ -12,6 +12,7 @@
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.net.HttpURLConnection;
+import java.net.SocketException;
 import java.net.URL;
 import java.security.KeyStore;
 import java.util.Objects;
@@ -341,7 +342,7 @@ public void testUnauthenticatedClientGetsRejected() throws Exception {
                     "tls/attacker/attack_key.pem",
                     "tls/rootca/RootCA.pem");
             throw new AssertionError("An unauthenticated client was able to talk to the server");
-        } catch (SSLException e) { // Unauthenticated client is rejected!
+        } catch (SSLException | SocketException e) { // Unauthenticated client is rejected!
             assert true;
         } catch (Exception e) { // Treat unexpected errors as a failure
             throw new AssertionError(