From 7990faffe2a2e66df8a829bc179b8e4cea42f346 Mon Sep 17 00:00:00 2001
From: Armin Braun <me@obrown.io>
Date: Thu, 10 Jan 2019 09:53:52 +0100
Subject: [PATCH] SNAPSHOT+TESTS: Stabilize SnapshotDisruptionIT

* Ensure retry by busy assert on SnapshotMissingException
* Closes #36739
---
 .../org/elasticsearch/discovery/SnapshotDisruptionIT.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/server/src/test/java/org/elasticsearch/discovery/SnapshotDisruptionIT.java b/server/src/test/java/org/elasticsearch/discovery/SnapshotDisruptionIT.java
index 29fa597aec63f..f6a95a3ed5b35 100644
--- a/server/src/test/java/org/elasticsearch/discovery/SnapshotDisruptionIT.java
+++ b/server/src/test/java/org/elasticsearch/discovery/SnapshotDisruptionIT.java
@@ -75,7 +75,6 @@ protected Settings nodeSettings(int nodeOrdinal) {
             .build();
     }
 
-    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/36779")
     public void testDisruptionOnSnapshotInitialization() throws Exception {
         final String idxName = "test";
         final List<String> allMasterEligibleNodes = internalCluster().startMasterOnlyNodes(3);
@@ -180,7 +179,11 @@ public void clusterChanged(ClusterChangedEvent event) {
 
         logger.info("--> verify that snapshot eventually will be created due to retries");
         assertBusy(() -> {
-            assertSnapshotExists("test-repo", "test-snap-2");
+            try {
+                assertSnapshotExists("test-repo", "test-snap-2");
+            } catch (SnapshotMissingException ex) {
+                throw new AssertionError(ex);
+            }
         }, 1, TimeUnit.MINUTES);
     }