Marvel integ test should stop and start exporters between tests. The ongoing activity messes with ESIntegTest level clean ups

Original commit: elastic/x-pack-elasticsearch@474ed7080a

elasticsearch/x-pack/marvel/src/test/java/org/elasticsearch/marvel/MarvelPluginTests.java

@@ -19,6 +19,18 @@ import static org.hamcrest.Matchers.equalTo;
 
 @ClusterScope(scope = TEST, transportClientRatio = 0, numClientNodes = 0, numDataNodes = 0)
 public class MarvelPluginTests extends MarvelIntegTestCase {
+
+
+    @Override
+    protected void startCollection() {
+        // do nothing as marvel is sometime unbound
+    }
+
+    @Override
+    protected void stopCollection() {
+        // do nothing as marvel is sometime unbound
+    }
+
     @Override
     protected Settings nodeSettings(int nodeOrdinal) {
         return Settings.builder()

elasticsearch/x-pack/marvel/src/test/java/org/elasticsearch/marvel/agent/exporter/http/HttpExporterTests.java

@@ -84,7 +84,6 @@ public class HttpExporterTests extends MarvelIntegTestCase {
 
     @After
     public void cleanup() throws Exception {
-        stopCollection();
         webServer.shutdown();
     }
 

elasticsearch/x-pack/marvel/src/test/java/org/elasticsearch/marvel/test/MarvelIntegTestCase.java

@@ -39,6 +39,8 @@ import org.elasticsearch.xpack.XPackClient;
 import org.elasticsearch.xpack.XPackPlugin;
 import org.hamcrest.Matcher;
 import org.jboss.netty.util.internal.SystemPropertyUtil;
+import org.junit.After;
+import org.junit.Before;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
@@ -166,6 +168,18 @@ public abstract class MarvelIntegTestCase extends ESIntegTestCase {
         return templates;
     }
 
+    @Before
+    public void setUp() throws Exception {
+        super.setUp();
+        startCollection();
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        stopCollection();
+        super.tearDown();
+    }
+
     /**
      * Override and return {@code false} to force running without Security.
      */