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@698900d002
This commit is contained in:
Martijn van Groningen 2015-04-01 20:47:39 +02:00
parent 54380478e5
commit 46f75d8fa1
2 changed files with 10 additions and 3 deletions

View File

@ -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();
}

View File

@ -51,7 +51,7 @@ public class NoMasterNodeTests extends AbstractWatcherIntegrationTests {
}
@Override
protected boolean shieldEnabled() {
protected boolean enableShield() {
return false;
}