From 43feb76df93c43a2d8cabed498d62705a51e9556 Mon Sep 17 00:00:00 2001 From: Noble Paul Date: Wed, 5 Jul 2017 15:33:20 +0930 Subject: [PATCH] SOLR-10994: fixing test errors --- .../autoscaling/AutoScalingHandlerTest.java | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/solr/core/src/test/org/apache/solr/cloud/autoscaling/AutoScalingHandlerTest.java b/solr/core/src/test/org/apache/solr/cloud/autoscaling/AutoScalingHandlerTest.java index 06c29202cd0..e4f8f5265eb 100644 --- a/solr/core/src/test/org/apache/solr/cloud/autoscaling/AutoScalingHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/autoscaling/AutoScalingHandlerTest.java @@ -595,6 +595,9 @@ public class AutoScalingHandlerTest extends SolrCloudTestCase { " ]," + " 'policy1':[" + " {'replica':'<2', 'shard': '#EACH', 'node': '#ANY'}" + + " ]," + + " 'policy2':[" + + " {'replica':'<7', 'shard': '#EACH', 'node': '#ANY'}" + " ]" + "}}"; req = createAutoScalingRequest(SolrRequest.METHOD.POST, setPolicyCommand); @@ -624,7 +627,7 @@ public class AutoScalingHandlerTest extends SolrCloudTestCase { Map policies = (Map) response.get("policies"); assertNotNull(policies); - assertEquals(2, policies.size()); + assertEquals(3, policies.size()); assertNotNull(policies.get("xyz")); assertNotNull(policies.get("policy1")); @@ -660,10 +663,21 @@ public class AutoScalingHandlerTest extends SolrCloudTestCase { assertEquals(0, violations.size()); // lets create a collection which violates the rule replicas < 2 - CollectionAdminRequest.Create create = CollectionAdminRequest.Create.createCollection("readApiTestViolations", CONFIGSET_NAME, 1, 6); - create.setMaxShardsPerNode(10); - CollectionAdminResponse adminResponse = create.process(solrClient); + CollectionAdminResponse adminResponse = CollectionAdminRequest.Create + .createCollection("readApiTestViolations", CONFIGSET_NAME, 1, 6) + .setPolicy("policy2") + .setMaxShardsPerNode(10) + .process(solrClient); assertTrue(adminResponse.isSuccess()); + setPolicyCommand = "{'set-policy': {" + + " 'policy2':[" + + " {'replica':'<2', 'shard': '#EACH', 'node': '#ANY'}" + + " ]" + + "}}"; + + req = createAutoScalingRequest(SolrRequest.METHOD.POST, setPolicyCommand); + response = solrClient.request(req); + assertEquals(response.get("result").toString(), "success"); // get the diagnostics output again req = createAutoScalingRequest(SolrRequest.METHOD.GET, "/diagnostics", null);