[lucene-solr] branch reference_impl_dev updated: @814 Tweaking for tests.

[ma...@apache.org]

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

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


The following commit(s) were added to refs/heads/reference_impl_dev by this push:
     new 4becea6  @814 Tweaking for tests.
4becea6 is described below

commit 4becea689f4b9fc630c7a242df7eb9a3a7896751
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Tue Sep 8 20:59:13 2020 -0500

    @814 Tweaking for tests.
---
 .../solr/client/solrj/embedded/JettySolrRunner.java      |  2 +-
 .../client/solrj/embedded/SolrExampleXMLHttp2Test.java   |  1 -
 .../solr/client/solrj/impl/CloudSolrClientTest.java      |  2 ++
 .../src/java/org/apache/solr/SolrTestCase.java           | 16 ++++++++--------
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java b/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
index df0cff9..51c0816 100644
--- a/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
+++ b/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
@@ -642,7 +642,7 @@ public class JettySolrRunner implements Closeable {
     int tryCnt = 1;
     while (tryCnt < 3) {
       try {
-        log.info("Trying to start Jetty on port {} try number {} ...", port, tryCnt);
+        log.info(" {} try number {} ...", port, tryCnt);
         server.start();
         break;
       } catch (IOException ioe) {
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleXMLHttp2Test.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleXMLHttp2Test.java
index acbc40d..b70c3cb 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleXMLHttp2Test.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleXMLHttp2Test.java
@@ -26,7 +26,6 @@ import org.eclipse.jetty.util.Jetty;
 import org.junit.BeforeClass;
 
 public class SolrExampleXMLHttp2Test extends SolrExampleTests {
-  protected static JettySolrRunner jetty;
 
   @BeforeClass
   public static void beforeSolrExampleXMLHttp2Test() throws Exception {
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java
index 4186d4c..7bebaf7 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java
@@ -38,6 +38,7 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.lucene.util.LuceneTestCase;
 import org.apache.lucene.util.LuceneTestCase.Slow;
 import org.apache.lucene.util.TestUtil;
 import org.apache.solr.SolrTestCaseJ4;
@@ -89,6 +90,7 @@ import org.slf4j.LoggerFactory;
  * This test would be faster if we simulated the zk state instead.
  */
 @Slow
+@LuceneTestCase.Nightly // can be randomly fairly slow, I think due to its thread pool executor shutting down
 public class CloudSolrClientTest extends SolrCloudTestCase {
 
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
index 8d4a2c0..5256099 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
@@ -301,17 +301,17 @@ public class SolrTestCase extends LuceneTestCase {
 
       System.setProperty("solr.http2solrclient.default.idletimeout", "15000");
       System.setProperty("distribUpdateSoTimeout", "15000");
-      System.setProperty("socketTimeout", "15000");
-      System.setProperty("connTimeout", "10000");
-      System.setProperty("solr.test.socketTimeout.default", "15000");
-      System.setProperty("solr.connect_timeout.default", "10000");
+      System.setProperty("socketTimeout", "3000");
+      System.setProperty("connTimeout", "3000");
+      System.setProperty("solr.test.socketTimeout.default", "3000");
+      System.setProperty("solr.connect_timeout.default", "3000");
       System.setProperty("solr.so_commit_timeout.default", "15000");
-      System.setProperty("solr.httpclient.defaultConnectTimeout", "10000");
-      System.setProperty("solr.httpclient.defaultSoTimeout", "15000");
+      System.setProperty("solr.httpclient.defaultConnectTimeout", "3000");
+      System.setProperty("solr.httpclient.defaultSoTimeout", "3000");
       // System.setProperty("solr.containerThreadsIdle", "30000"); no need to set
 
-      System.setProperty("solr.indexfetcher.sotimeout", "15000");
-      System.setProperty("solr.indexfetch.so_timeout.default", "15000");
+      System.setProperty("solr.indexfetcher.sotimeout", "3000");
+      System.setProperty("solr.indexfetch.so_timeout.default", "3000");
 
       System.setProperty("prepRecoveryReadTimeoutExtraWait", "100");
       System.setProperty("validateAfterInactivity", "-1");