Fix occasional failure in deprecation test (#36172)

Sometimes this test could end up trying to create an index with a negative or zero number of shards, which fails. This fixes the test.
elastic · Dec 3, 2018 · 2658e34 · 2658e34
1 parent 234e70d
commit 2658e34
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...tion/src/test/java/org/elasticsearch/xpack/deprecation/ClusterDeprecationChecksTests.java b/...tion/src/test/java/org/elasticsearch/xpack/deprecation/ClusterDeprecationChecksTests.java
@@ -25,7 +25,7 @@
 public class ClusterDeprecationChecksTests extends ESTestCase {
 
     public void testCheckShardLimit() {
-        int shardsPerNode = randomIntBetween(1, 10000);
+        int shardsPerNode = randomIntBetween(2, 10000);
         int nodeCount = randomIntBetween(1, 10);
         int maxShardsInCluster = shardsPerNode * nodeCount;
         int currentOpenShards = maxShardsInCluster + randomIntBetween(0, 100);
@@ -59,7 +59,7 @@ public void testCheckShardLimit() {
         MetaData goodMetaData = MetaData.builder(metaData).put(IndexMetaData.builder("test")
             .settings(settings(Version.CURRENT))
             .numberOfReplicas(0)
-            .numberOfShards(maxShardsInCluster - randomIntBetween(1, 100))).build();
+            .numberOfShards(maxShardsInCluster - randomIntBetween(1, (maxShardsInCluster - 1)))).build();
         ClusterState goodState = ClusterState.builder(ClusterName.DEFAULT)
             .metaData(goodMetaData).nodes(state.nodes()).build();
         issues = DeprecationChecks.filterChecks(CLUSTER_SETTINGS_CHECKS, c -> c.apply(goodState));