Skip to content

Commit 52e6fdf

Browse files
committed
Unmute WildFly tests in FIPS JVM (#32814)
WildflyIT test fails in a FIPS JVM due to the amount of output in stderr. The excessive stderr output is due to https://bugs.openjdk.java.net/browse/JDK-8202893 and is not an indication of a failure that should be tracked. This commit adjusts the limit to something more lenient that would allow the test to succeed. Reverts #32543
1 parent 870320c commit 52e6fdf

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

qa/wildfly/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ task deploy(type: Copy) {
8484
}
8585

8686
task writeElasticsearchProperties {
87-
onlyIf { !Os.isFamily(Os.FAMILY_WINDOWS) && !inFipsJvm }
87+
onlyIf { !Os.isFamily(Os.FAMILY_WINDOWS) }
8888
dependsOn 'integTestCluster#wait', deploy
8989
doLast {
9090
final File elasticsearchProperties = file("${wildflyInstall}/standalone/configuration/elasticsearch.properties")
@@ -177,7 +177,7 @@ task stopWildfly(type: LoggedExec) {
177177
commandLine "${wildflyInstall}/bin/jboss-cli.sh", "--controller=localhost:${-> managementPort}", "--connect", "command=shutdown"
178178
}
179179

180-
if (!Os.isFamily(Os.FAMILY_WINDOWS) && !inFipsJvm) {
180+
if (!Os.isFamily(Os.FAMILY_WINDOWS)) {
181181
integTestRunner.dependsOn(configureTransportClient)
182182
final TaskExecutionAdapter logDumpListener = new TaskExecutionAdapter() {
183183
@Override

qa/wildfly/src/test/java/org/elasticsearch/wildfly/WildflyIT.java

+2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import org.apache.http.impl.client.HttpClientBuilder;
2929
import org.apache.http.util.EntityUtils;
3030
import org.apache.lucene.util.LuceneTestCase;
31+
import org.apache.lucene.util.TestRuleLimitSysouts;
3132
import org.elasticsearch.Build;
3233
import org.elasticsearch.Version;
3334
import org.elasticsearch.cluster.ClusterModule;
@@ -50,6 +51,7 @@
5051
import static org.hamcrest.Matchers.equalTo;
5152
import static org.hamcrest.Matchers.instanceOf;
5253

54+
@TestRuleLimitSysouts.Limit(bytes = 14000)
5355
public class WildflyIT extends LuceneTestCase {
5456

5557
public void testTransportClient() throws URISyntaxException, IOException {

0 commit comments

Comments
 (0)