Merge branch 'RemoteSegmentStoreDirectory' into views-core

Signed-off-by: Peter Nied <[email protected]>
opensearch-project · Feb 15, 2024 · bbf4945 · bbf4945
2 parents 946a691 + fc600ac
commit bbf4945
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/server/src/test/java/org/opensearch/index/store/RemoteSegmentStoreDirectoryTests.java b/server/src/test/java/org/opensearch/index/store/RemoteSegmentStoreDirectoryTests.java
@@ -61,10 +61,6 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
-<<<<<<< HEAD
-import java.util.regex.Pattern;
-=======
->>>>>>> RemoteSegmentStoreDirectory
 import java.util.stream.Collectors;
 
 import org.mockito.Mockito;

diff --git a/test/framework/src/main/java/org/opensearch/test/MockLogAppender.java b/test/framework/src/main/java/org/opensearch/test/MockLogAppender.java
@@ -305,9 +305,7 @@ public void match(final LogEvent event) {
         public void assertMatched() {
             if (!eventSeen.get()) {
                 final StringBuilder failureMessage = new StringBuilder();
-                failureMessage.append(
-                    String.format("%s was not seen, found %d messages matching the logger.", expectationName, loggerMatches.size())
-                );
+                failureMessage.append(expectationName + " was not seen, found " + loggerMatches.size() + " messages matching the logger.");
                 failureMessage.append("\r\nMessage matching regex: " + messageMatchingRegex);
                 if (!loggerMatches.isEmpty()) {
                     failureMessage.append("\r\nMessage details:\r\n" + String.join("\r\n", loggerMatches));