You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2018/12/10 03:27:18 UTC

[17/18] lucene-solr:branch_7x: SOLR-12801: Harden CollectionsAPISolrJTest#testCreateCollWithDefaultClusterPropertiesOldFormat.

SOLR-12801: Harden CollectionsAPISolrJTest#testCreateCollWithDefaultClusterPropertiesOldFormat.


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/9af24fc8
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/9af24fc8
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/9af24fc8

Branch: refs/heads/branch_7x
Commit: 9af24fc8be5abffecc84dac7d0fa6995f7df76fd
Parents: 83f1140
Author: markrmiller <ma...@apache.org>
Authored: Sun Dec 9 18:50:47 2018 -0600
Committer: markrmiller <ma...@apache.org>
Committed: Sun Dec 9 20:58:55 2018 -0600

----------------------------------------------------------------------
 .../src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9af24fc8/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java b/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java
index 9502dd5..d249837 100644
--- a/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java
@@ -75,7 +75,6 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {
     
     // clear any persisted auto scaling configuration
     zkClient().setData(SOLR_AUTOSCALING_CONF_PATH, Utils.toJSON(new ZkNodeProps()), true);
-    cluster.deleteAllCollections();
     
     final ClusterProperties props = new ClusterProperties(zkClient());
     CollectionAdminRequest.setClusterProperty(ZkStateReader.LEGACY_CLOUD, null).process(cluster.getSolrClient());
@@ -130,7 +129,7 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {
           .build()
           .process(cluster.getSolrClient());
 
-      for (int i = 0; i < 30; i++) {
+      for (int i = 0; i < 300; i++) {
         Map m = cluster.getSolrClient().getZkStateReader().getClusterProperty(COLLECTION_DEF, null);
         if (m != null) break;
         Thread.sleep(10);