Ensuring test isolation when jvm plugins are loaded

Instead of specifying 'path.plugins' configuration option, 'plugin.types' is used to load plugins in integration tests. This makes sure the JVM plugins are not loaded in all following tests from then. Also removed the now unneeded es-plugin.properties files from JVM test plugins.

Author: spinscale

src/test/java/org/elasticsearch/test/integration/nodesinfo/SimpleNodesInfoTests.java

@@ -60,7 +60,6 @@ static final class Fields {
  static final String SITE_PLUGIN = "dummy";
  static final String SITE_PLUGIN_DESCRIPTION = "This is a description for a dummy test site plugin.";
  static final String SITE_PLUGIN_NO_DESCRIPTION = "No description found for dummy.";
- static final String JVM_PLUGIN_NO_DESCRIPTION = "No description found for test-no-version-plugin.";
  }
 
  @AfterMethod
@@ -126,9 +125,9 @@ public void testNodeInfoPlugin() throws URISyntaxException {
  // The second has one site plugin with a es-plugin.properties file (description and version)
  String server2NodeId = startNodeWithPlugins("node2");
  // The third has one java plugin
- String server3NodeId = startNodeWithPlugins("node3");
+ String server3NodeId = startNodeWithPlugins("node3", TestPlugin.class.getName());
  // The fourth has one java plugin and one site plugin
- String server4NodeId = startNodeWithPlugins("node4");
+ String server4NodeId = startNodeWithPlugins("node4", TestNoVersionPlugin.class.getName());
 
  ClusterHealthResponse clusterHealth = client("node4").admin().cluster().health(clusterHealthRequest().waitForGreenStatus()).actionGet();
  logger.info("--> done cluster_health, status " + clusterHealth.getStatus());
@@ -147,10 +146,9 @@ public void testNodeInfoPlugin() throws URISyntaxException {
  Lists.newArrayList(TestPlugin.Fields.DESCRIPTION),
  Collections.EMPTY_LIST, Collections.EMPTY_LIST);
 
- // Note that we have now 2 JVM plugins as we have already loaded one with node3
  assertNodeContainsPlugins(response, server4NodeId,
- Lists.newArrayList(TestPlugin.Fields.NAME, TestNoVersionPlugin.Fields.NAME),
- Lists.newArrayList(TestPlugin.Fields.DESCRIPTION, TestNoVersionPlugin.Fields.DESCRIPTION),
+ Lists.newArrayList(TestNoVersionPlugin.Fields.NAME),
+ Lists.newArrayList(TestNoVersionPlugin.Fields.DESCRIPTION),
  Lists.newArrayList(Fields.SITE_PLUGIN, TestNoVersionPlugin.Fields.NAME),
  Lists.newArrayList(Fields.SITE_PLUGIN_NO_DESCRIPTION, TestNoVersionPlugin.Fields.DESCRIPTION));
  }
@@ -196,13 +194,17 @@ private void assertNodeContainsPlugins(NodesInfoResponse response, String nodeId
  assertThat(sitePluginUrls, not(contains(nullValue())));
  }
 
- private String startNodeWithPlugins(String name) throws URISyntaxException {
+ private String startNodeWithPlugins(String name, String ... pluginClassNames) throws URISyntaxException {
  URL resource = SimpleNodesInfoTests.class.getResource("/org/elasticsearch/test/integration/nodesinfo/" + name + "/");
  ImmutableSettings.Builder settings = settingsBuilder();
  if (resource != null) {
  settings.put("path.plugins", new File(resource.toURI()).getAbsolutePath());
  }
 
+ if (pluginClassNames.length > 0) {
+ settings.putArray("plugin.types", pluginClassNames);
+ }
+
  startNode(name, settings);
 
  // We wait for a Green status

src/test/java/org/elasticsearch/test/integration/plugin/ResponseHeaderPluginTests.java

@@ -30,14 +30,13 @@
 import org.elasticsearch.node.internal.InternalNode;
 import org.elasticsearch.rest.RestStatus;
 import org.elasticsearch.test.integration.AbstractNodesTests;
+import org.elasticsearch.test.integration.plugin.responseheader.TestResponseHeaderPlugin;
 import org.elasticsearch.test.integration.rest.helper.HttpClient;
 import org.elasticsearch.test.integration.rest.helper.HttpClientResponse;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import java.io.File;
-import java.net.URL;
 import java.util.Map;
 
 /**
@@ -49,12 +48,7 @@ public class ResponseHeaderPluginTests extends AbstractNodesTests {
 
  @BeforeMethod
  public void startNode() throws Exception {
- URL resource = ResponseHeaderPluginTests.class.getResource("/org/elasticsearch/test/integration/responseheader/");
- ImmutableSettings.Builder settings = settingsBuilder();
- if (resource != null) {
- settings.put("path.plugins", new File(resource.toURI()).getAbsolutePath());
- }
-
+ ImmutableSettings.Builder settings = settingsBuilder().put("plugin.types", TestResponseHeaderPlugin.class.getName());
  startNode(NODE_ID, settings);
  client(NODE_ID).admin().cluster().health(clusterHealthRequest().waitForGreenStatus()).actionGet();
  }