wait for clusterStateProcessed

ywelsch · ywelsch · commit 08f15fb9b130 · 2018-06-14T13:55:52.000+02:00
diff --git a/server/src/test/java/org/elasticsearch/cluster/service/MasterServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/service/MasterServiceTests.java
@@ -754,7 +754,7 @@ public void onAckTimeout() {
 
         // check that we timeout if commit took too long
         {
-            final CountDownLatch latch = new CountDownLatch(1);
+            final CountDownLatch latch = new CountDownLatch(2);
 
             final TimeValue ackTimeout = TimeValue.timeValueMillis(randomInt(100));
 
@@ -783,7 +783,7 @@ public TimeValue timeout() {
 
                 @Override
                 public void clusterStateProcessed(String source, ClusterState oldState, ClusterState newState) {
-                    // ok
+                    latch.countDown();
                 }
 
                 @Override

Original file line number	Diff line number	Diff line change
`@@ -754,7 +754,7 @@ public void onAckTimeout() {`
`754`	`754`
`755`	`755`	`// check that we timeout if commit took too long`
`756`	`756`	`{`
`757`		`- final CountDownLatch latch = new CountDownLatch(1);`
	`757`	`+ final CountDownLatch latch = new CountDownLatch(2);`
`758`	`758`
`759`	`759`	`final TimeValue ackTimeout = TimeValue.timeValueMillis(randomInt(100));`
`760`	`760`
`@@ -783,7 +783,7 @@ public TimeValue timeout() {`
`783`	`783`
`784`	`784`	`@Override`
`785`	`785`	`public void clusterStateProcessed(String source, ClusterState oldState, ClusterState newState) {`
`786`		`- // ok`
	`786`	`+ latch.countDown();`
`787`	`787`	`}`
`788`	`788`
`789`	`789`	`@Override`