Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

Flaky test TestDistributedGrouping timeAllowed (#4692)

David Smiley8701b2c2e019
diff --git a/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java b/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java
index ec534cd3208..55b336bb074 100644
--- a/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java
+++ b/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java
@@ -1296,7 +1296,7 @@ public class TestDistributedGrouping extends BaseDistributedSearchTestCase {
"cache",
"false",
"timeAllowed",
- "200",
+ "10000", // generous; queries must complete fully even on slow CI
"sleep",
"10");
assertFalse(
diff --git a/solr/core/src/test/org/apache/solr/TestGroupingSearch.java b/solr/core/src/test/org/apache/solr/TestGroupingSearch.java
index c408cfc3332..0f4d51b936c 100644
--- a/solr/core/src/test/org/apache/solr/TestGroupingSearch.java
+++ b/solr/core/src/test/org/apache/solr/TestGroupingSearch.java
@@ -481,7 +481,7 @@ public class TestGroupingSearch extends SolrTestCaseJ4 {
"group.query",
"id:2",
"timeAllowed",
- "200"),
+ "10000"), // generous; must complete fully even on slow CI
"/grouped/id:1/matches==5",
"/grouped/id:2/matches==5");
}
diff --git a/solr/core/src/test/org/apache/solr/search/TestQueryLimits.java b/solr/core/src/test/org/apache/solr/search/TestQueryLimits.java
index 2e6d773924e..2a868b2d65e 100644
--- a/solr/core/src/test/org/apache/solr/search/TestQueryLimits.java
+++ b/solr/core/src/test/org/apache/solr/search/TestQueryLimits.java
@@ -114,7 +114,7 @@ public class TestQueryLimits extends SolrCloudTestCase {
@Test
public void testAdjustShardRequestLimits() throws Exception {
SolrClient solrClient = cluster.getSolrClient();
- String timeAllowed = "1000"; // ms - increased from 500 to avoid flakiness with grouped queries
+ String timeAllowed = "10000"; // ms - generous; must complete fully even on slow CI
ModifiableSolrParams params =
params(
"q",