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

Posted to commits@lucene.apache.org by ho...@apache.org on 2013/08/08 21:03:41 UTC

svn commit: r1511954 - /lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestIndexSearcher.java

Author: hossman
Date: Thu Aug  8 19:03:40 2013
New Revision: 1511954

URL: http://svn.apache.org/r1511954
Log:
SOLR-4952: TestIndexSearcher.testReopen needs fixed segment merging

Modified:
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestIndexSearcher.java

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestIndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestIndexSearcher.java?rev=1511954&r1=1511953&r2=1511954&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestIndexSearcher.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestIndexSearcher.java Thu Aug  8 19:03:40 2013
@@ -16,6 +16,7 @@
  */
 package org.apache.solr.search;
 
+import org.apache.lucene.index.LogDocMergePolicy;
 import org.apache.lucene.index.AtomicReaderContext;
 import org.apache.lucene.index.IndexReaderContext;
 import org.apache.lucene.index.ReaderUtil;
@@ -34,6 +35,11 @@ public class TestIndexSearcher extends S
 
   @BeforeClass
   public static void beforeClass() throws Exception {
+
+    // we need a consistent segmentation because reopen test validation
+    // dependso n merges not happening when it doesn't expect
+    System.setProperty("solr.tests.mergePolicy", LogDocMergePolicy.class.getName());
+
     initCore("solrconfig.xml","schema.xml");
   }