From a18bd9caa2aee390c774f4bff0bb1a31965ccecf Mon Sep 17 00:00:00 2001
From: Boaz Leskes <b.leskes@gmail.com>
Date: Tue, 3 Oct 2017 12:24:36 +0200
Subject: [PATCH] Increase ESRestTestCase.waitForClusterStateUpdatesToFinish
 time out to 30s

It is set to 10 sec but sometimes it takes the cluster longer to settle.
---
 .../java/org/elasticsearch/test/rest/ESRestTestCase.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java
index 97b58ceda72..02fefdae191 100644
--- a/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java
+++ b/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java
@@ -41,6 +41,7 @@ import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
 
+import javax.net.ssl.SSLContext;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
@@ -55,8 +56,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
-import javax.net.ssl.SSLContext;
+import java.util.concurrent.TimeUnit;
 
 import static java.util.Collections.singletonMap;
 import static java.util.Collections.sort;
@@ -287,7 +287,7 @@ public abstract class ESRestTestCase extends ESTestCase {
             } catch (IOException e) {
                 fail("cannot get cluster's pending tasks: " + e.getMessage());
             }
-        });
+        }, 30, TimeUnit.SECONDS);
     }
 
     /**