svn commit: r1514377 - /lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java

[ho...@apache.org]

Author: hossman
Date: Thu Aug 15 17:04:48 2013
New Revision: 1514377

URL: http://svn.apache.org/r1514377
Log:
SOLR-4952: SolrCmdDistributorTest needs to force MergePolicy for consistent optimize() behavior

Modified:
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java?rev=1514377&r1=1514376&r2=1514377&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java Thu Aug 15 17:04:48 2013
@@ -23,6 +23,8 @@ import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.apache.lucene.index.LogDocMergePolicy;
+
 import org.apache.solr.BaseDistributedSearchTestCase;
 import org.apache.solr.client.solrj.SolrQuery;
 import org.apache.solr.client.solrj.SolrServer;
@@ -45,7 +47,16 @@ import org.apache.solr.update.SolrCmdDis
 import org.apache.solr.update.SolrCmdDistributor.StdNode;
 import org.apache.solr.update.processor.DistributedUpdateProcessor;
 
+import org.junit.BeforeClass;
+
 public class SolrCmdDistributorTest extends BaseDistributedSearchTestCase {
+  @BeforeClass
+  public static void beforeClass() throws Exception {
+
+    // we can't use the Randomized merge policy because the test depends on
+    // being able to call optimize to have all deletes expunged.
+    System.setProperty("solr.tests.mergePolicy", LogDocMergePolicy.class.getName());
+  }
   private UpdateShardHandler updateShardHandler;
   
   public SolrCmdDistributorTest() {