You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ro...@apache.org on 2021/10/04 11:46:34 UTC

[lucene] branch main updated: LUCENE-10118: Test fix

This is an automated email from the ASF dual-hosted git repository.

romseygeek pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/lucene.git


The following commit(s) were added to refs/heads/main by this push:
     new 04fb8c0  LUCENE-10118: Test fix
04fb8c0 is described below

commit 04fb8c059e6fa6f8ec7c39e44b3db97944e8522e
Author: Chris Hegarty <62...@users.noreply.github.com>
AuthorDate: Mon Oct 4 12:46:30 2021 +0100

    LUCENE-10118: Test fix
    
    We need to collect messages in a thread-safe list, as we're writing from multiple
    threads.
---
 .../org/apache/lucene/index/TestConcurrentMergeScheduler.java  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java b/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java
index 4ad8339..6ec2946 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java
@@ -19,6 +19,7 @@ package org.apache.lucene.index;
 import com.carrotsearch.randomizedtesting.generators.RandomStrings;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -638,7 +639,7 @@ public class TestConcurrentMergeScheduler extends LuceneTestCase {
         };
     iwc.setMergeScheduler(cms);
 
-    List<String> messages = new ArrayList<>();
+    List<String> messages = Collections.synchronizedList(new ArrayList<>());
     iwc.setInfoStream(
         new InfoStream() {
           @Override
@@ -682,7 +683,12 @@ public class TestConcurrentMergeScheduler extends LuceneTestCase {
           messages.stream()
               .filter(line -> line.startsWith("merge thread " + name))
               .collect(Collectors.toList());
-      assertTrue(threadMsgs.size() >= 3);
+      assertTrue(
+          "Expected:·a·value·equal·to·or·greater·than·3,·got:"
+              + threadMsgs.size()
+              + ", threadMsgs="
+              + threadMsgs,
+          threadMsgs.size() >= 3);
       assertTrue(threadMsgs.get(0).startsWith("merge thread " + name + " start"));
       assertTrue(
           threadMsgs.stream()