From 27448dc3d06bdd24e345793bddee26ca5a33889b Mon Sep 17 00:00:00 2001
From: Jason Tedor <jason@tedor.me>
Date: Tue, 29 Mar 2016 12:09:48 -0400
Subject: [PATCH] Adjust for long random timeout in acked indexing

---
 .../discovery/DiscoveryWithServiceDisruptionsIT.java         | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/src/test/java/org/elasticsearch/discovery/DiscoveryWithServiceDisruptionsIT.java b/core/src/test/java/org/elasticsearch/discovery/DiscoveryWithServiceDisruptionsIT.java
index 928daa95c88..e47cb2081e7 100644
--- a/core/src/test/java/org/elasticsearch/discovery/DiscoveryWithServiceDisruptionsIT.java
+++ b/core/src/test/java/org/elasticsearch/discovery/DiscoveryWithServiceDisruptionsIT.java
@@ -444,7 +444,8 @@ public class DiscoveryWithServiceDisruptionsIT extends ESIntegTestCase {
             + "indices.recovery:TRACE,indices.cluster:TRACE")
     public void testAckedIndexing() throws Exception {
 
-        final String timeout = !(TEST_NIGHTLY && rarely()) ? "1s" : "5s";
+        final int seconds = !(TEST_NIGHTLY && rarely()) ? 1 : 5;
+        final String timeout = seconds + "s";
 
         // TODO: add node count randomizaion
         final List<String> nodes = startCluster(3);
@@ -534,7 +535,7 @@ public class DiscoveryWithServiceDisruptionsIT extends ESIntegTestCase {
                     semaphore.release(docsPerIndexer);
                 }
                 logger.info("waiting for indexing requests to complete");
-                assertTrue(countDownLatchRef.get().await(docsPerIndexer * 1000 + 2000, TimeUnit.MILLISECONDS));
+                assertTrue(countDownLatchRef.get().await(docsPerIndexer * seconds * 1000 + 2000, TimeUnit.MILLISECONDS));
 
                 logger.info("stopping disruption");
                 disruptionScheme.stopDisrupting();