Apache Solr open-source search software
Test: UpdateRequestProcessorFactoryTest, can be flaky (#3277)
David Smileybbdeb90c30dc
diff --git a/solr/core/src/test/org/apache/solr/update/processor/UpdateRequestProcessorFactoryTest.java b/solr/core/src/test/org/apache/solr/update/processor/UpdateRequestProcessorFactoryTest.javaindex 0ba7a4f96e2..31e00aae924 100644--- a/solr/core/src/test/org/apache/solr/update/processor/UpdateRequestProcessorFactoryTest.java+++ b/solr/core/src/test/org/apache/solr/update/processor/UpdateRequestProcessorFactoryTest.java@@ -19,7 +19,6 @@ package org.apache.solr.update.processor;import static org.apache.solr.update.processor.DistributingUpdateProcessorFactory.DISTRIB_UPDATE_PARAM;import java.io.IOException;-import java.lang.invoke.MethodHandles;import java.util.ArrayList;import java.util.Arrays;import java.util.List;@@ -27,15 +26,12 @@ import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.core.SolrCore;import org.apache.solr.response.SolrQueryResponse;+import org.apache.solr.util.LogLevel;import org.junit.BeforeClass;-import org.slf4j.Logger;import org.slf4j.LoggerFactory;-/** */public class UpdateRequestProcessorFactoryTest extends SolrTestCaseJ4 {- private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());-@BeforeClasspublic static void beforeClass() throws Exception {System.setProperty("enable.runtime.lib", "true");@@ -86,6 +82,7 @@ public class UpdateRequestProcessorFactoryTest extends SolrTestCaseJ4 {assertEquals("{name={n8=88, n9=99}}", link.args.toString());}+ @LogLevel("org.apache.solr.update.processor.LogUpdateProcessorFactory=INFO")public void testUpdateDistribChainSkipping() throws IOException {// a key part of this test is verifying that LogUpdateProcessor is found in all chains because@@ -99,7 +96,8 @@ public class UpdateRequestProcessorFactoryTest extends SolrTestCaseJ4 {assertTrue("Tests must be run with INFO level logging "+ "otherwise LogUpdateProcessor isn't used and can't be tested.",- log.isInfoEnabled());+ LoggerFactory.getLogger(LogUpdateProcessorFactory.class)+ .isInfoEnabled()); // nowarn_valid_loggerfinal int EXPECTED_CHAIN_LENGTH = 5;SolrCore core = h.getCore();diff --git a/solr/modules/s3-repository/src/test/org/apache/solr/s3/AbstractS3ClientTest.java b/solr/modules/s3-repository/src/test/org/apache/solr/s3/AbstractS3ClientTest.javaindex 3c72dd3a4c1..7fb19079939 100644--- a/solr/modules/s3-repository/src/test/org/apache/solr/s3/AbstractS3ClientTest.java+++ b/solr/modules/s3-repository/src/test/org/apache/solr/s3/AbstractS3ClientTest.java@@ -36,7 +36,7 @@ public class AbstractS3ClientTest extends SolrTestCaseJ4 {@ClassRulepublic static final S3MockRule S3_MOCK_RULE =- S3MockRule.builder().silent().withInitialBuckets(BUCKET_NAME).build();+ S3MockRule.builder().withInitialBuckets(BUCKET_NAME).build();S3StorageClient client;diff --git a/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3BackupRepositoryTest.java b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3BackupRepositoryTest.javaindex 498b0788ab0..0a613172723 100644--- a/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3BackupRepositoryTest.java+++ b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3BackupRepositoryTest.java@@ -53,11 +53,7 @@ public class S3BackupRepositoryTest extends AbstractBackupRepositoryTest {@ClassRulepublic static final S3MockRule S3_MOCK_RULE =- S3MockRule.builder()- .silent()- .withInitialBuckets(BUCKET_NAME)- .withSecureConnection(false)- .build();+ S3MockRule.builder().withInitialBuckets(BUCKET_NAME).withSecureConnection(false).build();/*** Sent by {@link org.apache.solr.handler.ReplicationHandler}, ensure we don't choke on the barediff --git a/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3IncrementalBackupTest.java b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3IncrementalBackupTest.javaindex 7825c33afc1..70266290a94 100644--- a/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3IncrementalBackupTest.java+++ b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3IncrementalBackupTest.java@@ -38,11 +38,7 @@ public class S3IncrementalBackupTest extends AbstractIncrementalBackupTest {@ClassRulepublic static final S3MockRule S3_MOCK_RULE =- S3MockRule.builder()- .silent()- .withInitialBuckets(BUCKET_NAME)- .withSecureConnection(false)- .build();+ S3MockRule.builder().withInitialBuckets(BUCKET_NAME).withSecureConnection(false).build();public static final String SOLR_XML ="<solr>\n"diff --git a/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3InstallShardTest.java b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3InstallShardTest.javaindex 19c88caa089..f97cc083d27 100644--- a/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3InstallShardTest.java+++ b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3InstallShardTest.java@@ -55,11 +55,7 @@ public class S3InstallShardTest extends AbstractInstallShardTest {@ClassRulepublic static final S3MockRule S3_MOCK_RULE =- S3MockRule.builder()- .silent()- .withInitialBuckets(BUCKET_NAME)- .withSecureConnection(false)- .build();+ S3MockRule.builder().withInitialBuckets(BUCKET_NAME).withSecureConnection(false).build();@BeforeClasspublic static void setupClass() throws Exception {diff --git a/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3OutputStreamTest.java b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3OutputStreamTest.javaindex 1116d3103d4..c74cf6ddb3e 100644--- a/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3OutputStreamTest.java+++ b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3OutputStreamTest.java@@ -34,7 +34,7 @@ public class S3OutputStreamTest extends SolrTestCaseJ4 {@ClassRulepublic static final S3MockRule S3_MOCK_RULE =- S3MockRule.builder().silent().withInitialBuckets(BUCKET).withSecureConnection(false).build();+ S3MockRule.builder().withInitialBuckets(BUCKET).withSecureConnection(false).build();private S3Client s3;