[lucene-solr] branch master updated: SOLR-14934: Fix some additional test helper methods that aren't used on master but triggered problems when when backporting to branch_8x

[ho...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 05a8477  SOLR-14934: Fix some additional test helper methods that aren't used on master but triggered problems when when backporting to branch_8x
05a8477 is described below

commit 05a8477a362beb6b0e5a02b6ee4dfa106a2e6a76
Author: Chris Hostetter <ho...@apache.org>
AuthorDate: Wed Dec 2 13:35:33 2020 -0700

    SOLR-14934: Fix some additional test helper methods that aren't used on master but triggered problems when when backporting to branch_8x
---
 solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
index 61af73b..7aa14f4 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
@@ -818,6 +818,7 @@ public abstract class SolrTestCaseJ4 extends SolrTestCase {
 
   public static CoreContainer createCoreContainer(Path solrHome, String solrXML) {
     testSolrHome = requireNonNull(solrHome);
+    System.setProperty("solr.solr.home", solrHome.toAbsolutePath().toString());
     h = new TestHarness(solrHome, solrXML);
     lrf = h.getRequestFactory("", 0, 20, CommonParams.VERSION, "2.2");
     return h.getCoreContainer();
@@ -840,6 +841,7 @@ public abstract class SolrTestCaseJ4 extends SolrTestCase {
 
   public static CoreContainer createDefaultCoreContainer(Path solrHome) {
     testSolrHome = requireNonNull(solrHome);
+    System.setProperty("solr.solr.home", solrHome.toAbsolutePath().toString());
     h = new TestHarness("collection1", initAndGetDataDir().getAbsolutePath(), "solrconfig.xml", "schema.xml");
     lrf = h.getRequestFactory("", 0, 20, CommonParams.VERSION, "2.2");
     return h.getCoreContainer();