From 46f75d8fa16bb63e7f8cbdeba9c99d406c5719a6 Mon Sep 17 00:00:00 2001
From: Martijn van Groningen <martijn.v.groningen@gmail.com>
Date: Wed, 1 Apr 2015 20:47:39 +0200
Subject: [PATCH] Test: add AWI#enableShield() to decide if shield should run
and let AWI#shieldEnabled() return whether shield is running in the test
cluster
Original commit: elastic/x-pack-elasticsearch@698900d0028637a85d55329458787429f808bb72
---
.../watcher/test/AbstractWatcherIntegrationTests.java | 11 +++++++++--
.../watcher/test/integration/NoMasterNodeTests.java | 2 +-
2 files changed, 10 insertions(+), 3 deletions(-)
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;
}