[TEST] Use NoMergePolicy rather than NoMergeScheduler in FreqTermsEnu…

…mTests
MaineC · Apr 2, 2014 · e189b3e · e189b3e
1 parent 4ff3e19
commit e189b3e
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/test/java/org/elasticsearch/common/lucene/index/FreqTermsEnumTests.java b/src/test/java/org/elasticsearch/common/lucene/index/FreqTermsEnumTests.java
@@ -76,7 +76,10 @@ public void setUp() throws Exception {
 
         Directory dir = newDirectory();
         IndexWriterConfig conf = newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()));
-        conf.setMergeScheduler(NoMergeScheduler.INSTANCE); // we don't want to do any merges, so we won't expunge deletes
+        if (frequently()) {
+            // we don't want to do any merges, so we won't expunge deletes
+            conf.setMergePolicy(randomBoolean() ? NoMergePolicy.COMPOUND_FILES : NoMergePolicy.NO_COMPOUND_FILES);
+        }
         iw = new IndexWriter(dir, conf);
         terms = new String[scaledRandomIntBetween(10, 300)];
         for (int i = 0; i < terms.length; i++) {