From 679148e43ed6d76fce4a5a308f6ae013fcfc90d0 Mon Sep 17 00:00:00 2001 From: Ioannis Kakavas Date: Wed, 3 Jun 2020 08:28:09 +0300 Subject: [PATCH] Mute EmailSslTests test case in fips (#57576) We test expected TLS failures by catching SSLException, but other security providers ( i.e. BCFIPS ) might throw a different one. In this case, BCFIPS throws org.bouncycastle.tls.TlsFatalAlert --- .../xpack/watcher/actions/email/EmailSslTests.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/email/EmailSslTests.java b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/email/EmailSslTests.java index 7966b1954b29d..0fcbceb813f64 100644 --- a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/email/EmailSslTests.java +++ b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/email/EmailSslTests.java @@ -144,10 +144,11 @@ public void testCanSendMessageToSmtpServerUsingSmtpSslTrust() throws Exception { } /** - * This orderining could be considered to be backwards (the global "notification" settings take precedence + * This ordering could be considered to be backwards (the global "notification" settings take precedence * over the account level "smtp.ssl.trust" setting) but smtp.ssl.trust was ignored for a period of time (see #52153) * so this is the least breaking way to resolve that. */ + @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/49094") public void testNotificationSslSettingsOverrideSmtpSslTrust() throws Exception { List messages = new ArrayList<>(); server.addListener(messages::add);