From dccaa49aa0487e0d87963bcfa8a560c35f083e72 Mon Sep 17 00:00:00 2001
From: Martijn van Groningen <martijn.v.groningen@gmail.com>
Date: Fri, 6 Mar 2015 13:50:22 +0100
Subject: [PATCH] Tests: wait for discovery to be completed after both majority
 nodes follow a new master

---
 .../discovery/DiscoveryWithServiceDisruptionsTests.java          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/test/java/org/elasticsearch/discovery/DiscoveryWithServiceDisruptionsTests.java b/src/test/java/org/elasticsearch/discovery/DiscoveryWithServiceDisruptionsTests.java
index 15727fbebd7..345fd468354 100644
--- a/src/test/java/org/elasticsearch/discovery/DiscoveryWithServiceDisruptionsTests.java
+++ b/src/test/java/org/elasticsearch/discovery/DiscoveryWithServiceDisruptionsTests.java
@@ -650,6 +650,7 @@ public class DiscoveryWithServiceDisruptionsTests extends ElasticsearchIntegrati
         // Wait for the majority side to get stable
         assertDifferentMaster(majoritySide.get(0), oldMasterNode);
         assertDifferentMaster(majoritySide.get(1), oldMasterNode);
+        assertDiscoveryCompleted(majoritySide);
 
         // The old master node is frozen, but here we submit a cluster state update task that doesn't get executed,
         // but will be queued and once the old master node un-freezes it gets executed.