From 01383849816b366b467429b74e9b992cfd764f77 Mon Sep 17 00:00:00 2001 From: Tanguy Leroux Date: Tue, 24 Nov 2015 12:44:15 +0100 Subject: [PATCH] Marvel: Unmute nodes stats tests Original commit: elastic/x-pack-elasticsearch@9244d6e15a603499d2800e1b933d4b1d73de302f --- .../marvel/agent/renderer/node/MultiNodesStatsTests.java | 4 +--- .../marvel/agent/renderer/node/NodeStatsRendererTests.java | 2 -- .../marvel/agent/renderer/node/NodeStatsTests.java | 2 -- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/node/MultiNodesStatsTests.java b/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/node/MultiNodesStatsTests.java index 27602daeee9..5d6ebfe54b5 100644 --- a/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/node/MultiNodesStatsTests.java +++ b/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/node/MultiNodesStatsTests.java @@ -5,7 +5,6 @@ */ package org.elasticsearch.marvel.agent.renderer.node; -import org.apache.lucene.util.LuceneTestCase; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.query.QueryBuilders; @@ -19,9 +18,8 @@ import org.junit.After; import java.util.concurrent.TimeUnit; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoTimeout; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.greaterThan; -@LuceneTestCase.AwaitsFix(bugUrl = "https://github.com/elastic/x-plugins/pull/994") @ClusterScope(scope = Scope.TEST, numDataNodes = 0, numClientNodes = 0, transportClientRatio = 0.0) public class MultiNodesStatsTests extends MarvelIntegTestCase { diff --git a/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/node/NodeStatsRendererTests.java b/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/node/NodeStatsRendererTests.java index e2b13ee1e1d..582fc70042c 100644 --- a/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/node/NodeStatsRendererTests.java +++ b/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/node/NodeStatsRendererTests.java @@ -5,7 +5,6 @@ */ package org.elasticsearch.marvel.agent.renderer.node; -import org.apache.lucene.util.LuceneTestCase; import org.elasticsearch.action.admin.cluster.node.stats.NodeStats; import org.elasticsearch.marvel.agent.collector.node.NodeStatsMarvelDoc; import org.elasticsearch.marvel.agent.renderer.Renderer; @@ -14,7 +13,6 @@ import org.elasticsearch.node.service.NodeService; import org.elasticsearch.test.ESSingleNodeTestCase; import org.elasticsearch.test.StreamsUtils; -@LuceneTestCase.AwaitsFix(bugUrl = "https://github.com/elastic/x-plugins/pull/994") public class NodeStatsRendererTests extends ESSingleNodeTestCase { private static final String SAMPLE_FILE = "/samples/node_stats.json"; diff --git a/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/node/NodeStatsTests.java b/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/node/NodeStatsTests.java index de16323b092..d63b4d62d24 100644 --- a/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/node/NodeStatsTests.java +++ b/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/node/NodeStatsTests.java @@ -5,7 +5,6 @@ */ package org.elasticsearch.marvel.agent.renderer.node; -import org.apache.lucene.util.LuceneTestCase; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.marvel.agent.collector.node.NodeStatsCollector; @@ -22,7 +21,6 @@ import java.util.concurrent.TimeUnit; import static org.hamcrest.Matchers.greaterThan; -@LuceneTestCase.AwaitsFix(bugUrl = "https://github.com/elastic/x-plugins/pull/994") // numClientNodes is set to 0 because Client nodes don't have Filesystem stats @ClusterScope(scope = Scope.TEST, numClientNodes = 0, transportClientRatio = 0.0) public class NodeStatsTests extends MarvelIntegTestCase {