svn commit: r1433788 - in /lucene/dev/branches/lucene_solr_4_1: ./ lucene/ lucene/core/ lucene/core/src/test/org/apache/lucene/search/TestNRTManager.java

[sa...@apache.org]

Author: sarowe
Date: Wed Jan 16 01:31:28 2013
New Revision: 1433788

URL: http://svn.apache.org/viewvc?rev=1433788&view=rev
Log:
LUCENE-4676: Use NoMergePolicy in starvation test to prevent buffered deletes pruning

Modified:
    lucene/dev/branches/lucene_solr_4_1/   (props changed)
    lucene/dev/branches/lucene_solr_4_1/lucene/   (props changed)
    lucene/dev/branches/lucene_solr_4_1/lucene/core/   (props changed)
    lucene/dev/branches/lucene_solr_4_1/lucene/core/src/test/org/apache/lucene/search/TestNRTManager.java

Modified: lucene/dev/branches/lucene_solr_4_1/lucene/core/src/test/org/apache/lucene/search/TestNRTManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_1/lucene/core/src/test/org/apache/lucene/search/TestNRTManager.java?rev=1433788&r1=1433787&r2=1433788&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_1/lucene/core/src/test/org/apache/lucene/search/TestNRTManager.java (original)
+++ lucene/dev/branches/lucene_solr_4_1/lucene/core/src/test/org/apache/lucene/search/TestNRTManager.java Wed Jan 16 01:31:28 2013
@@ -31,6 +31,7 @@ import org.apache.lucene.index.Directory
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.index.IndexWriterConfig;
+import org.apache.lucene.index.NoMergePolicy;
 import org.apache.lucene.index.IndexableField;
 import org.apache.lucene.index.RandomIndexWriter;
 import org.apache.lucene.index.Term;
@@ -294,6 +295,7 @@ public class TestNRTManager extends Thre
    */
   public void testThreadStarvationNoDeleteNRTReader() throws IOException, InterruptedException {
     IndexWriterConfig conf = newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()));
+    conf.setMergePolicy(random().nextBoolean() ? NoMergePolicy.COMPOUND_FILES : NoMergePolicy.NO_COMPOUND_FILES);
     Directory d = newDirectory();
     final CountDownLatch latch = new CountDownLatch(1);
     final CountDownLatch signal = new CountDownLatch(1);