dsmiley commented on code in PR #2244:
URL: https://github.com/apache/solr/pull/2244#discussion_r1492951008
##########
solr/core/src/test/org/apache/solr/search/TestCpuAllowedLimit.java:
##########
@@ -20,32 +20,61 @@
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.concurrent.TimeUnit;
-import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.SolrClient;
+import org.apache.solr.client.solrj.request.CollectionAdminRequest;
import org.apache.solr.client.solrj.response.QueryResponse;
-import org.apache.solr.util.SolrJettyTestRule;
+import org.apache.solr.cloud.CloudUtil;
+import org.apache.solr.cloud.SolrCloudTestCase;
import org.apache.solr.util.ThreadCpuTimer;
-import org.junit.AfterClass;
import org.junit.Assume;
import org.junit.BeforeClass;
-import org.junit.ClassRule;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class TestCpuAllowedLimit extends SolrTestCaseJ4 {
+public class TestCpuAllowedLimit extends SolrCloudTestCase {
private static final Logger log =
LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
- @ClassRule public static final SolrJettyTestRule solrRule = new
SolrJettyTestRule();
+ private static final String COLLECTION = "test";
- @BeforeClass
- public static void setup() {
- System.setProperty(ThreadCpuTimer.ENABLE_CPU_TIME, "true");
+ private static Path createConfigSet() throws Exception {
+ Path configSet = createTempDir();
+ copyMinConf(configSet.toFile());
+ // insert an expensive search component
+ Path solrConfig = configSet.resolve("conf/solrconfig.xml");
+ Files.writeString(
+ solrConfig,
+ Files.readString(solrConfig)
+ .replace(
+ "<requestHandler",
+ "<searchComponent name=\"expensiveSearchComponent\"\n"
+ + "
class=\"org.apache.solr.search.ExpensiveSearchComponent\"/>\n"
+ + "\n"
+ + " <requestHandler")
+ .replace(
+ "class=\"solr.SearchHandler\">",
+ "class=\"solr.SearchHandler\">\n"
+ + " <arr name=\"first-components\">\n"
+ + " <str>expensiveSearchComponent</str>\n"
+ + " </arr>\n"));
+ return configSet.resolve("conf");
}
- @AfterClass
- public static void teardown() {
- System.clearProperty(ThreadCpuTimer.ENABLE_CPU_TIME);
+ @BeforeClass
+ public static void setup() throws Exception {
+ System.setProperty(ThreadCpuTimer.ENABLE_CPU_TIME, "true");
+ Path configset = createConfigSet();
+ configureCluster(2).addConfig("conf", configset).configure();
Review Comment:
Do we actually need 2 nodes to test this? (Trying to keep tests as lean as
needed to test what they need to test; no more)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For additional commands, e-mail: issues-h...@solr.apache.org
