[SEARCH-2400]

removed conf directory from solrhome in distributed tests
This commit is contained in:
elia
2020-09-07 12:43:51 +02:00
parent 227df218f3
commit ae7fef1534

View File

@@ -168,7 +168,7 @@ public abstract class SolrITInitializer extends SolrTestCaseJ4
RandomSupplier.RandVal.uniqueValues = new HashSet<>(); // reset random values RandomSupplier.RandVal.uniqueValues = new HashSet<>(); // reset random values
createServers(testClassName, coreNames, numShards, solrcoreProperties); createServers(testClassName, coreNames, numShards, solrcoreProperties);
System.setProperty("solr.solr.home", testDir.toPath().resolve(testClassName).toString());
return testClassName; return testClassName;
} }
@@ -531,8 +531,6 @@ public abstract class SolrITInitializer extends SolrTestCaseJ4
{ {
FileUtils.copyFile(new File(getTestFilesHome(), getSolrXml()), jettyHome.resolve(getSolrXml()).toFile()); FileUtils.copyFile(new File(getTestFilesHome(), getSolrXml()), jettyHome.resolve(getSolrXml()).toFile());
//Add solr home conf folder with alfresco based configuration.
FileUtils.copyDirectory(new File(getTestFilesHome() + "/conf"), jettyHome.resolve("conf").toFile());
// Add alfresco data model def // Add alfresco data model def
FileUtils.copyDirectory(new File(getTestFilesHome() + "/alfrescoModels"), jettyHome.resolve("alfrescoModels").toFile()); FileUtils.copyDirectory(new File(getTestFilesHome() + "/alfrescoModels"), jettyHome.resolve("alfrescoModels").toFile());
// Add templates // Add templates