diff --git a/src/test/java/org/elasticsearch/watcher/test/AbstractWatcherIntegrationTests.java b/src/test/java/org/elasticsearch/watcher/test/AbstractWatcherIntegrationTests.java index 19fcae1b5db..84e720b7620 100644 --- a/src/test/java/org/elasticsearch/watcher/test/AbstractWatcherIntegrationTests.java +++ b/src/test/java/org/elasticsearch/watcher/test/AbstractWatcherIntegrationTests.java @@ -82,7 +82,7 @@ public abstract class AbstractWatcherIntegrationTests extends ElasticsearchInteg private TimeWarp timeWarp; - boolean shieldEnabled = shieldEnabled(); + boolean shieldEnabled = enableShield(); @Override protected Settings nodeSettings(int nodeOrdinal) { @@ -108,9 +108,16 @@ public abstract class AbstractWatcherIntegrationTests extends ElasticsearchInteg } /** - * Override and returns {@code false} to force running without shield + * @return whether shield has been enabled */ protected boolean shieldEnabled() { + return shieldEnabled; + } + + /** + * Override and returns {@code false} to force running without shield + */ + protected boolean enableShield() { return randomBoolean(); } 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 a40751a9cf6..9ad79a168b2 100644 --- a/src/test/java/org/elasticsearch/watcher/test/integration/NoMasterNodeTests.java +++ b/src/test/java/org/elasticsearch/watcher/test/integration/NoMasterNodeTests.java @@ -51,7 +51,7 @@ public class NoMasterNodeTests extends AbstractWatcherIntegrationTests { } @Override - protected boolean shieldEnabled() { + protected boolean enableShield() { return false; }