[7.16] Fix Watcher testWatcherWithApiKey (elastic#82136) (elastic#82230)

astefan · Jan 4, 2022 · 5f8cd39 · 5f8cd39
1 parent 8684b76
commit 5f8cd39
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/...l-cluster-restart/src/test/java/org/elasticsearch/xpack/restart/FullClusterRestartIT.java b/...l-cluster-restart/src/test/java/org/elasticsearch/xpack/restart/FullClusterRestartIT.java
@@ -233,7 +233,6 @@ public void testWatcher() throws Exception {
     }
 
     @SuppressWarnings("unchecked")
-    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/77026")
     public void testWatcherWithApiKey() throws Exception {
         assumeTrue("API key is available since 6.7.0", getOldClusterVersion().onOrAfter(Version.V_6_7_0));
         if (isRunningAgainstOldCluster()) {
@@ -259,7 +258,7 @@ public void testWatcherWithApiKey() throws Exception {
                 final Map<String, Object> getWatchStatusResponse = entityAsMap(client().performRequest(getRequest));
                 final Map<String, Object> status = (Map<String, Object>) getWatchStatusResponse.get("status");
                 assertEquals("executed", status.get("execution_state"));
-            });
+            }, 30, TimeUnit.SECONDS);
 
         } else {
             logger.info("testing against {}", getOldClusterVersion());
@@ -299,7 +298,7 @@ public void testWatcherWithApiKey() throws Exception {
                         versionIncreased.get() && executed.get(),
                         is(true)
                     );
-                });
+                }, 30, TimeUnit.SECONDS);
             } finally {
                 stopWatcher();
             }