From 5e7ef773b37aaa8b75bc0e4e03c61c75d1cb7c13 Mon Sep 17 00:00:00 2001 From: Martijn van Groningen Date: Thu, 7 May 2015 00:40:16 +0200 Subject: [PATCH] test: change no master block assert and if it fails print which node doesn't have a master block. Original commit: elastic/x-pack-elasticsearch@656a1bc3df59f2332b381cf62312da64313f815d --- .../watcher/test/integration/NoMasterNodeTests.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/test/java/org/elasticsearch/watcher/test/integration/NoMasterNodeTests.java b/src/test/java/org/elasticsearch/watcher/test/integration/NoMasterNodeTests.java index ee1fadf2f8a..11b88a1af05 100644 --- a/src/test/java/org/elasticsearch/watcher/test/integration/NoMasterNodeTests.java +++ b/src/test/java/org/elasticsearch/watcher/test/integration/NoMasterNodeTests.java @@ -220,17 +220,14 @@ public class NoMasterNodeTests extends AbstractWatcherIntegrationTests { private void stopElectedMasterNodeAndWait() throws Exception { internalTestCluster().stopCurrentMasterNode(); // Can't use ensureWatcherStopped, b/c that relies on the watcher stats api which requires an elected master node - assertThat(awaitBusy(new Predicate() { - public boolean apply(Object obj) { + assertBusy(new Runnable() { + public void run () { for (Client client : clients()) { ClusterState state = client.admin().cluster().prepareState().setLocal(true).get().getState(); - if (!state.blocks().hasGlobalBlock(DiscoverySettings.NO_MASTER_BLOCK_ID)) { - return false; - } + assertThat("Node [" + state.nodes().localNode() + "] should have a NO_MASTER_BLOCK", state.blocks().hasGlobalBlock(DiscoverySettings.NO_MASTER_BLOCK_ID), is(true)); } - return true; } - }, 30, TimeUnit.SECONDS), equalTo(true)); + }, 30, TimeUnit.SECONDS); // Ensure that the watch manager doesn't run elsewhere for (WatcherService watcherService : internalTestCluster().getInstances(WatcherService.class)) { assertThat(watcherService.state(), is(WatcherState.STOPPED));