From 52b1ae33a10ce94b599156a0c0cc5078899a9750 Mon Sep 17 00:00:00 2001
From: markrmiller <markrmiller@apache.org>
Date: Thu, 2 Feb 2017 13:21:23 -0500
Subject: [PATCH] SOLR-10064: The Nightly test
 HdfsCollectionsAPIDistributedZkTest appears to be too fragile.

---
 .../org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java  | 2 +-
 .../src/java/org/apache/solr/cloud/SolrCloudTestCase.java       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java b/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java
index 7586f2ad46a..132d0712a33 100644
--- a/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java
@@ -366,7 +366,7 @@ public class CollectionsAPIDistributedZkTest extends SolrCloudTestCase {
       cluster.getSolrClient().request(createCmd);
     });
 
-    TimeUnit.MILLISECONDS.sleep(200);
+    TimeUnit.MILLISECONDS.sleep(1000);
     // in both cases, the collection should have default to the core name
     cloudClient.getZkStateReader().forceUpdateCollection("corewithnocollection3");
 
diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/SolrCloudTestCase.java b/solr/test-framework/src/java/org/apache/solr/cloud/SolrCloudTestCase.java
index 34dc8ac877e..7fc82578a72 100644
--- a/solr/test-framework/src/java/org/apache/solr/cloud/SolrCloudTestCase.java
+++ b/solr/test-framework/src/java/org/apache/solr/cloud/SolrCloudTestCase.java
@@ -70,7 +70,7 @@ import org.junit.Before;
  */
 public class SolrCloudTestCase extends SolrTestCaseJ4 {
 
-  public static final int DEFAULT_TIMEOUT = 30;
+  public static final int DEFAULT_TIMEOUT = 60;
 
   private static class Config {
     final String name;