From 81a3f367f81dea760e206c5a776ea5bb4ad81e86 Mon Sep 17 00:00:00 2001
From: Hendrik Muhs <hendrik.muhs@elastic.co>
Date: Thu, 12 Apr 2018 07:50:05 +0200
Subject: [PATCH] Improve watcher smoke test stability

port test re-factorings from elastic/x-pack-elasticsearch#4240 to improve smoke test stability

relates elastic/x-pack-elasticsearch#4311 elastic/x-pack-elasticsearch#3812

Original commit: elastic/x-pack-elasticsearch@d5fb16eef4ae9c357902a9fb88895d20788831ed
---
 .../SmokeTestWatcherWithSecurityIT.java       | 53 +++++++++++++++----
 1 file changed, 44 insertions(+), 9 deletions(-)

diff --git a/qa/smoke-test-watcher-with-security/src/test/java/org/elasticsearch/smoketest/SmokeTestWatcherWithSecurityIT.java b/qa/smoke-test-watcher-with-security/src/test/java/org/elasticsearch/smoketest/SmokeTestWatcherWithSecurityIT.java
index 859ae453ec0..529a1aaec27 100644
--- a/qa/smoke-test-watcher-with-security/src/test/java/org/elasticsearch/smoketest/SmokeTestWatcherWithSecurityIT.java
+++ b/qa/smoke-test-watcher-with-security/src/test/java/org/elasticsearch/smoketest/SmokeTestWatcherWithSecurityIT.java
@@ -7,6 +7,7 @@ package org.elasticsearch.smoketest;
 
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.StringEntity;
+import org.apache.http.util.EntityUtils;
 import org.elasticsearch.client.Response;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.settings.SecureString;
@@ -26,6 +27,7 @@ import java.util.concurrent.atomic.AtomicReference;
 
 import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
 import static org.elasticsearch.xpack.core.security.authc.support.UsernamePasswordToken.basicAuthHeaderValue;
+import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.greaterThanOrEqualTo;
 import static org.hamcrest.Matchers.hasEntry;
 import static org.hamcrest.Matchers.is;
@@ -50,20 +52,37 @@ public class SmokeTestWatcherWithSecurityIT extends ESRestTestCase {
 
         assertBusy(() -> {
             try {
-                adminClient().performRequest("POST", "_xpack/watcher/_start");
-
-                for (String template : WatcherIndexTemplateRegistryField.TEMPLATE_NAMES) {
-                    assertOK(adminClient().performRequest("HEAD", "_template/" + template));
-                }
-
                 Response statsResponse = adminClient().performRequest("GET", "_xpack/watcher/stats");
                 ObjectPath objectPath = ObjectPath.createFromResponse(statsResponse);
                 String state = objectPath.evaluate("stats.0.watcher_state");
-                assertThat(state, is("started"));
+
+                switch (state) {
+                case "stopped":
+                    Response startResponse = adminClient().performRequest("POST", "_xpack/watcher/_start");
+                    assertOK(startResponse);
+                    String body = EntityUtils.toString(startResponse.getEntity());
+                    assertThat(body, containsString("\"acknowledged\":true"));
+                    break;
+                case "stopping":
+                    throw new AssertionError("waiting until stopping state reached stopped state to start again");
+                case "starting":
+                    throw new AssertionError("waiting until starting state reached started state");
+                case "started":
+                    // all good here, we are done
+                    break;
+                default:
+                    throw new AssertionError("unknown state[" + state + "]");
+                }
             } catch (IOException e) {
                 throw new AssertionError(e);
             }
         });
+
+        assertBusy(() -> {
+            for (String template : WatcherIndexTemplateRegistryField.TEMPLATE_NAMES) {
+                assertOK(adminClient().performRequest("HEAD", "_template/" + template));
+            }
+        });
     }
 
     @After
@@ -73,11 +92,27 @@ public class SmokeTestWatcherWithSecurityIT extends ESRestTestCase {
 
         assertBusy(() -> {
             try {
-                adminClient().performRequest("POST", "_xpack/watcher/_stop", Collections.emptyMap());
                 Response statsResponse = adminClient().performRequest("GET", "_xpack/watcher/stats");
                 ObjectPath objectPath = ObjectPath.createFromResponse(statsResponse);
                 String state = objectPath.evaluate("stats.0.watcher_state");
-                assertThat(state, is("stopped"));
+
+                switch (state) {
+                case "stopped":
+                    // all good here, we are done
+                    break;
+                case "stopping":
+                    throw new AssertionError("waiting until stopping state reached stopped state");
+                case "starting":
+                    throw new AssertionError("waiting until starting state reached started state to stop");
+                case "started":
+                    Response stopResponse = adminClient().performRequest("POST", "_xpack/watcher/_stop", Collections.emptyMap());
+                    assertOK(stopResponse);
+                    String body = EntityUtils.toString(stopResponse.getEntity());
+                    assertThat(body, containsString("\"acknowledged\":true"));
+                    break;
+                default:
+                    throw new AssertionError("unknown state[" + state + "]");
+                }
             } catch (IOException e) {
                 throw new AssertionError(e);
             }