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 2019/08/19 19:04:57 UTC

[lucene-solr] branch branch_8x updated: Harden TestExportWriter

This is an automated email from the ASF dual-hosted git repository.

hossman pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/branch_8x by this push:
     new c324be4  Harden TestExportWriter
c324be4 is described below

commit c324be487480cdbe9b317ca6725fcba5dfc57b6b
Author: Chris Hostetter <ho...@apache.org>
AuthorDate: Mon Aug 19 11:44:38 2019 -0700

    Harden TestExportWriter
    
    force MergePolicy to ensure index order assumptions are valid
    
    (cherry picked from commit 8a24641fb2b2949855a3b9226fb83375295a257e)
---
 .../src/test/org/apache/solr/handler/export/TestExportWriter.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/solr/core/src/test/org/apache/solr/handler/export/TestExportWriter.java b/solr/core/src/test/org/apache/solr/handler/export/TestExportWriter.java
index 17e6db0..4bd21fe 100644
--- a/solr/core/src/test/org/apache/solr/handler/export/TestExportWriter.java
+++ b/solr/core/src/test/org/apache/solr/handler/export/TestExportWriter.java
@@ -34,6 +34,7 @@ import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.common.SolrInputDocument;
 import org.apache.solr.common.util.SuppressForbidden;
 import org.apache.solr.common.util.Utils;
+import org.apache.solr.index.LogDocMergePolicyFactory;
 import org.apache.solr.request.SolrQueryRequest;
 import org.apache.solr.schema.SchemaField;
 import org.junit.Before;
@@ -44,7 +45,9 @@ public class TestExportWriter extends SolrTestCaseJ4 {
   
   @BeforeClass
   public static void beforeClass() throws Exception {
-    System.setProperty("export.test", "true");
+    // force LogDocMergePolicy so that we get a predictable doc order
+    // when testing index order results
+    systemSetPropertySolrTestsMergePolicyFactory(LogDocMergePolicyFactory.class.getName());
     initCore("solrconfig-sortingresponse.xml","schema-sortingresponse.xml");
   }