Apache Lucene open-source search software
Fix flaky test in TestMergeSchedulerExternal #13547 (#14562)
Dawid Weiss612f0da4a4ce
diff --git a/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java b/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.javaindex c57e4d5a363..306bb6bc7d3 100644--- a/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java+++ b/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java@@ -116,9 +116,10 @@ public class TestMergeSchedulerExternal extends LuceneTestCase {Field idField = newStringField("id", "", Field.Store.YES);doc.add(idField);+ MyMergeScheduler mergeScheduler = new MyMergeScheduler();IndexWriterConfig iwc =newIndexWriterConfig(new MockAnalyzer(random()))- .setMergeScheduler(new MyMergeScheduler())+ .setMergeScheduler(mergeScheduler).setMaxBufferedDocs(2).setRAMBufferSizeMB(IndexWriterConfig.DISABLE_AUTO_FLUSH).setMergePolicy(newLogMergePolicy());@@ -141,13 +142,7 @@ public class TestMergeSchedulerExternal extends LuceneTestCase {// OK}- try {- ((MyMergeScheduler) writer.getConfig().getMergeScheduler()).sync();- } catch (- @SuppressWarnings("unused")- IllegalStateException ise) {- // OK- }+ mergeScheduler.sync();writer.rollback();try {