Disable TestZenDiscovery in cloud providers integrations test
TestZenDiscovery is used to allow discovery based on in memory structures. This isn't a relevant for the cloud providers tests (but isn't a problem at the moment either)
This commit is contained in:
parent
5b229c31d6
commit
0ca141880f
|
@ -38,6 +38,11 @@ public abstract class AbstractAzureComputeServiceTestCase extends ESIntegTestCas
|
|||
this.mockPlugin = mockPlugin;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean addTestZenDiscovery() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Settings nodeSettings(int nodeOrdinal) {
|
||||
Settings.Builder builder = Settings.builder()
|
||||
|
|
|
@ -19,7 +19,6 @@
|
|||
|
||||
package org.elasticsearch.discovery.azure.classic;
|
||||
|
||||
import org.apache.lucene.util.LuceneTestCase.AwaitsFix;
|
||||
import org.elasticsearch.cloud.azure.classic.AbstractAzureComputeServiceTestCase;
|
||||
import org.elasticsearch.cloud.azure.classic.AzureComputeServiceTwoNodesMock;
|
||||
import org.elasticsearch.common.settings.Settings;
|
||||
|
@ -59,6 +58,7 @@ public class AzureMinimumMasterNodesTests extends AbstractAzureComputeServiceTes
|
|||
return builder.build();
|
||||
}
|
||||
|
||||
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/27917")
|
||||
public void testSimpleOnlyMasterNodeElection() throws IOException {
|
||||
logger.info("--> start data node / non master node");
|
||||
internalCluster().startNode();
|
||||
|
|
|
@ -24,7 +24,6 @@ import org.elasticsearch.common.io.PathUtils;
|
|||
import org.elasticsearch.common.settings.Settings;
|
||||
import org.elasticsearch.common.settings.SettingsException;
|
||||
import org.elasticsearch.env.Environment;
|
||||
import org.elasticsearch.discovery.ec2.Ec2DiscoveryPlugin;
|
||||
import org.elasticsearch.plugins.Plugin;
|
||||
import org.elasticsearch.test.ESIntegTestCase;
|
||||
import org.elasticsearch.test.ESIntegTestCase.ThirdParty;
|
||||
|
@ -69,4 +68,9 @@ public abstract class AbstractAwsTestCase extends ESIntegTestCase {
|
|||
protected Collection<Class<? extends Plugin>> nodePlugins() {
|
||||
return Arrays.asList(Ec2DiscoveryPlugin.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean addTestZenDiscovery() {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -104,6 +104,11 @@ public class GceDiscoverTests extends ESIntegTestCase {
|
|||
.build();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean addTestZenDiscovery() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@BeforeClass
|
||||
public static void startHttpd() throws Exception {
|
||||
logDir = createTempDir();
|
||||
|
|
Loading…
Reference in New Issue