Fix failing failing testWatcherRestart (#35243)

pgomulka · web-flow · commit 7f20c0b76883 · 2019-01-10T15:09:45.000+01:00
Reenabling the test on 6.x as #35271 looks like fixed the problem. If that helps on 6.x it will be back ported to 6.6, 6.5 and previous versions where this test is muted. closes #33753
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")`
`181`	`180`	`public void testWatcherRestart() throws Exception {`
`182`	`181`	`executeUpgradeIfNeeded();`
	`182`	`+ ensureWatcherStarted();`
`183`	`183`
`184`	`184`	`executeAgainstRandomNode(client -> assertOK(client.performRequest("POST", "/_xpack/watcher/_stop")));`
`185`	`185`	`ensureWatcherStopped();`