Skip to content

Commit 88ddd31

Browse files
committed
Fix non integration tests
With change #24, non integration can not run anymore. (cherry picked from commit 76eecc8)
1 parent 45492c0 commit 88ddd31

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

src/test/java/org/elasticsearch/discovery/azure/AbstractAzureComputeServiceTest.java

+11-2
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,13 @@
2020
package org.elasticsearch.discovery.azure;
2121

2222
import org.elasticsearch.action.admin.cluster.node.info.NodesInfoResponse;
23-
import org.elasticsearch.cloud.azure.AbstractAzureTest;
2423
import org.elasticsearch.cloud.azure.AzureComputeService;
2524
import org.elasticsearch.common.settings.ImmutableSettings;
2625
import org.elasticsearch.common.settings.Settings;
26+
import org.elasticsearch.plugins.PluginsService;
27+
import org.elasticsearch.test.ElasticsearchIntegrationTest;
2728

28-
public abstract class AbstractAzureComputeServiceTest extends AbstractAzureTest {
29+
public abstract class AbstractAzureComputeServiceTest extends ElasticsearchIntegrationTest {
2930

3031
private Class<? extends AzureComputeService> mock;
3132

@@ -34,6 +35,14 @@ public AbstractAzureComputeServiceTest(Class<? extends AzureComputeService> mock
3435
this.mock = mock;
3536
}
3637

38+
@Override
39+
protected Settings nodeSettings(int nodeOrdinal) {
40+
ImmutableSettings.Builder settings = ImmutableSettings.builder()
41+
.put(super.nodeSettings(nodeOrdinal))
42+
.put("plugins." + PluginsService.LOAD_PLUGIN_FROM_CLASSPATH, true);
43+
return settings.build();
44+
}
45+
3746
protected void checkNumberOfNodes(int expected) {
3847
NodesInfoResponse nodeInfos = client().admin().cluster().prepareNodesInfo().execute().actionGet();
3948
assertNotNull(nodeInfos);

0 commit comments

Comments
 (0)