From 794b2e0089ec450a7e906ea68b09bb3141915070 Mon Sep 17 00:00:00 2001 From: Tanguy Leroux Date: Tue, 1 Sep 2015 14:15:22 +0200 Subject: [PATCH] Marvel: Remove AwaitFix on NodeStatsRendererTests Now thread pools are sorted by names in elasticsearch core (see elastic/elasticsearchelastic/elasticsearch#13121) Closes elastic/elasticsearch#367 Original commit: elastic/x-pack-elasticsearch@d2fab327c0653b57017fe93d9f0bbd642b1fcfb5 --- .../marvel/agent/renderer/node/NodeStatsRendererTests.java | 1 - marvel/src/test/resources/samples/marvel_node_stats.json | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) 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 7e826dfbc22..a4e997aa846 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 @@ -19,7 +19,6 @@ public class NodeStatsRendererTests extends ESSingleNodeTestCase { private static final String SAMPLE_FILE = "/samples/marvel_node_stats.json"; @Test - @AwaitsFix(bugUrl = "https://github.com/elastic/x-plugins/issues/367") public void testNodeStatsRenderer() throws Exception { createIndex("index-0"); diff --git a/marvel/src/test/resources/samples/marvel_node_stats.json b/marvel/src/test/resources/samples/marvel_node_stats.json index 7f9aebba9b4..65801643681 100644 --- a/marvel/src/test/resources/samples/marvel_node_stats.json +++ b/marvel/src/test/resources/samples/marvel_node_stats.json @@ -48,14 +48,14 @@ } }, "thread_pool": { + "bulk": { + "rejected": 0 + }, "index": { "rejected": 0 }, "search": { "rejected": 0 - }, - "bulk": { - "rejected": 0 } }, "fs": {