Revert "Fix failing failing testWatcherRestart (#35243)"

Christoph Büscher · Christoph Büscher · commit 633aac157d99 · 2019-01-10T22:38:32.000+01:00
This reverts commit 7f20c0b.
diff --git a/x-pack/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/WatchBackwardsCompatibilityIT.java b/x-pack/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/WatchBackwardsCompatibilityIT.java
@@ -177,9 +177,9 @@ public void testWatcherStats() throws Exception {
         );
     }
 
+    @AwaitsFix(bugUrl="https://github.com/elastic/elasticsearch/issues/33753")
     public void testWatcherRestart() throws Exception {
         executeUpgradeIfNeeded();
-        ensureWatcherStarted();
 
         executeAgainstRandomNode(client -> assertOK(client.performRequest("POST", "/_xpack/watcher/_stop")));
         ensureWatcherStopped();

Original file line number	Diff line number	Diff line change
`@@ -177,9 +177,9 @@ public void testWatcherStats() throws Exception {`
`177`	`177`	`);`
`178`	`178`	`}`
`179`	`179`
	`180`	`+ @AwaitsFix(bugUrl="https://github.com/elastic/elasticsearch/issues/33753")`
`180`	`181`	`public void testWatcherRestart() throws Exception {`
`181`	`182`	`executeUpgradeIfNeeded();`
`182`		`- ensureWatcherStarted();`
`183`	`183`
`184`	`184`	`executeAgainstRandomNode(client -> assertOK(client.performRequest("POST", "/_xpack/watcher/_stop")));`
`185`	`185`	`ensureWatcherStopped();`