From 6a46660d40fefa164098fe4f25269e255304acca Mon Sep 17 00:00:00 2001 From: jaymode Date: Mon, 26 Oct 2015 15:36:33 -0400 Subject: [PATCH] remove unnecessary wildcards Original commit: elastic/x-pack-elasticsearch@65bad879f60126367401ac46144650267727c7dc --- .../elasticsearch/smoketest/MarvelClusterInfoIT.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/qa/smoke-test-found-license-with-shield-and-watcher/src/test/java/org/elasticsearch/smoketest/MarvelClusterInfoIT.java b/qa/smoke-test-found-license-with-shield-and-watcher/src/test/java/org/elasticsearch/smoketest/MarvelClusterInfoIT.java index 344e870e402..a8eaf9c74eb 100644 --- a/qa/smoke-test-found-license-with-shield-and-watcher/src/test/java/org/elasticsearch/smoketest/MarvelClusterInfoIT.java +++ b/qa/smoke-test-found-license-with-shield-and-watcher/src/test/java/org/elasticsearch/smoketest/MarvelClusterInfoIT.java @@ -44,7 +44,7 @@ public class MarvelClusterInfoIT extends ESIntegTestCase { final String clusterUUID = client().admin().cluster().prepareState().setMetaData(true).get().getState().metaData().clusterUUID(); assertTrue(Strings.hasText(clusterUUID)); awaitIndexExists(".marvel-es-data"); - ensureMarvelIndicesGreen(); + ensureGreen(".marvel-es-data"); awaitMarvelDocsCount(equalTo(1L), "cluster_info"); GetResponse response = client().prepareGet(".marvel-es-data", "cluster_info", clusterUUID).get(); assertTrue(".marvel-es-data" + " document does not exist", response.isExists()); @@ -56,14 +56,6 @@ public class MarvelClusterInfoIT extends ESIntegTestCase { assertThat(licenseObj, nullValue()); } - protected void ensureMarvelIndicesGreen() { - try { - ensureGreen(".marvel-es-*"); - } catch (IndexNotFoundException e) { - // might happen with shield... - } - } - protected void awaitMarvelDocsCount(Matcher matcher, String... types) throws Exception { flush(); refresh(); @@ -77,7 +69,7 @@ public class MarvelClusterInfoIT extends ESIntegTestCase { protected void assertMarvelDocsCount(Matcher matcher, String... types) { try { - long count = client().prepareSearch(".marvel-es-*").setSize(0) + long count = client().prepareSearch(".marvel-es-data").setSize(0) .setTypes(types).get().getHits().totalHits(); logger.trace("--> searched for [{}] documents, found [{}]", Strings.arrayToCommaDelimitedString(types), count); assertThat(count, matcher);