From 267492ce070583a2bc2510bb09254a85b0c1e667 Mon Sep 17 00:00:00 2001 From: Martijn van Groningen Date: Mon, 17 Feb 2020 11:16:33 +0100 Subject: [PATCH] Improve watcher rolling upgrade tests Relates to #33185 --- .../upgrades/UpgradeClusterClientYamlTestSuiteIT.java | 1 + .../rest-api-spec/test/old_cluster/60_watcher.yml | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/x-pack/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/UpgradeClusterClientYamlTestSuiteIT.java b/x-pack/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/UpgradeClusterClientYamlTestSuiteIT.java index a163b11b61934..bfeea6b3f3926 100644 --- a/x-pack/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/UpgradeClusterClientYamlTestSuiteIT.java +++ b/x-pack/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/UpgradeClusterClientYamlTestSuiteIT.java @@ -46,6 +46,7 @@ public void waitForWatcher() throws Exception { Response response = client().performRequest(new Request("GET", "_watcher/stats")); Map responseBody = entityAsMap(response); List stats = (List) responseBody.get("stats"); + assertThat(stats.size(), equalTo(3)); for (Object stat : stats) { Map statAsMap = (Map) stat; assertThat(statAsMap.get("watcher_state"), equalTo("started")); diff --git a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/60_watcher.yml b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/60_watcher.yml index ef7b470b11e7a..4f6d0f9fd9828 100644 --- a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/60_watcher.yml +++ b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/60_watcher.yml @@ -27,6 +27,14 @@ - match: { found : true} - match: { _id: "my_watch" } + - do: + cluster.health: + index: .watches + wait_for_status: green + wait_for_no_relocating_shards: true + wait_for_events: languid + timeout: 1m + # execute watch - do: watcher.execute_watch: