Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport 273 to 2.x #280

Merged
merged 1 commit into from
Jan 26, 2023
Merged

Backport 273 to 2.x #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
3 changes: 2 additions & 1 deletion src/test/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerWebServerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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(
Expand Down