You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@lucene.apache.org by mi...@apache.org on 2011/05/05 19:08:15 UTC

svn commit: r1099875 - in /lucene/dev/branches/branch_3x: ./ lucene/ lucene/backwards/ lucene/src/test/org/apache/lucene/index/TestDeletionPolicy.java solr/

Author: mikemccand
Date: Thu May  5 17:08:15 2011
New Revision: 1099875

URL: http://svn.apache.org/viewvc?rev=1099875&view=rev
Log:
force in-order merging for this test (backport from trunk)

Modified:
    lucene/dev/branches/branch_3x/   (props changed)
    lucene/dev/branches/branch_3x/lucene/   (props changed)
    lucene/dev/branches/branch_3x/lucene/backwards/   (props changed)
    lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestDeletionPolicy.java
    lucene/dev/branches/branch_3x/solr/   (props changed)

Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestDeletionPolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestDeletionPolicy.java?rev=1099875&r1=1099874&r2=1099875&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestDeletionPolicy.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestDeletionPolicy.java Thu May  5 17:08:15 2011
@@ -621,7 +621,7 @@ public class TestDeletionPolicy extends 
       Directory dir = newDirectory();
       IndexWriterConfig conf = newIndexWriterConfig(
           TEST_VERSION_CURRENT, new MockAnalyzer(random))
-          .setOpenMode(OpenMode.CREATE).setIndexDeletionPolicy(policy);
+        .setOpenMode(OpenMode.CREATE).setIndexDeletionPolicy(policy).setMergePolicy(newLogMergePolicy());
       MergePolicy mp = conf.getMergePolicy();
       if (mp instanceof LogMergePolicy) {
         ((LogMergePolicy) mp).setUseCompoundFile(useCompoundFile);