From 664a0689d0f5b504ba839756f2f0007f896d0e4d Mon Sep 17 00:00:00 2001 From: Tim Vernum Date: Tue, 29 Dec 2020 16:33:43 +1100 Subject: [PATCH] Skip netty4 yaml test in FIPS mode The "Netty loaded" YAML test asserts that the configured transport is "netty4", however when in FIPS mode, the tests enable security and the configured transport is "security4". This change skips the netty4 yaml test when running in FIPS mode. Resolves: #66818 --- .../http/netty4/Netty4ClientYamlTestSuiteIT.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/transport-netty4/src/yamlRestTest/java/org/elasticsearch/http/netty4/Netty4ClientYamlTestSuiteIT.java b/modules/transport-netty4/src/yamlRestTest/java/org/elasticsearch/http/netty4/Netty4ClientYamlTestSuiteIT.java index d6628c69b695c..4af8d5c10de5d 100644 --- a/modules/transport-netty4/src/yamlRestTest/java/org/elasticsearch/http/netty4/Netty4ClientYamlTestSuiteIT.java +++ b/modules/transport-netty4/src/yamlRestTest/java/org/elasticsearch/http/netty4/Netty4ClientYamlTestSuiteIT.java @@ -27,6 +27,8 @@ import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate; import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase; +import java.io.IOException; + //TODO: This is a *temporary* workaround to ensure a timeout does not mask other problems @TimeoutSuite(millis = 30 * TimeUnits.MINUTE) public class Netty4ClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase { @@ -40,4 +42,9 @@ public static Iterable parameters() throws Exception { return ESClientYamlSuiteTestCase.createParameters(); } + @Override + public void test() throws IOException { + assumeFalse("FIPS JVMs are configured to use the 'security4' transport rather than 'netty4'", inFipsJvm()); + super.test(); + } }