From a30995c48c8eca84e0a16486d61ce2f9522ff885 Mon Sep 17 00:00:00 2001
From: David Turner <david.turner@elastic.co>
Date: Thu, 9 May 2024 18:27:41 +0100
Subject: [PATCH] Ensure listener called in
 testRegisterRepositorySuccessAfterCreationFailed

---
 .../RepositoriesServiceTests.java             | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/server/src/test/java/org/elasticsearch/repositories/RepositoriesServiceTests.java b/server/src/test/java/org/elasticsearch/repositories/RepositoriesServiceTests.java
index 5a736b4e1e9dd..addf76e3365e4 100644
--- a/server/src/test/java/org/elasticsearch/repositories/RepositoriesServiceTests.java
+++ b/server/src/test/java/org/elasticsearch/repositories/RepositoriesServiceTests.java
@@ -10,6 +10,7 @@
 
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.admin.cluster.repositories.put.PutRepositoryRequest;
+import org.elasticsearch.action.support.SubscribableListener;
 import org.elasticsearch.action.support.master.AcknowledgedResponse;
 import org.elasticsearch.cluster.ClusterChangedEvent;
 import org.elasticsearch.cluster.ClusterName;
@@ -283,18 +284,13 @@ public void testRegisterRepositorySuccessAfterCreationFailed() {
         // 2. repository creation successfully when current node become master node and repository is put again
         var request = new PutRepositoryRequest().name(repoName).type(TestRepository.TYPE);
 
-        repositoriesService.registerRepository(request, new ActionListener<>() {
-            @Override
-            public void onResponse(AcknowledgedResponse acknowledgedResponse) {
-                assertTrue(acknowledgedResponse.isAcknowledged());
-                assertThat(repositoriesService.repository(repoName), isA(TestRepository.class));
-            }
-
-            @Override
-            public void onFailure(Exception e) {
-                assert false : e;
-            }
-        });
+        safeAwait(
+            SubscribableListener.<AcknowledgedResponse>newForked(l -> repositoriesService.registerRepository(request, l))
+                .andThenAccept(acknowledgedResponse -> {
+                    assertTrue(acknowledgedResponse.isAcknowledged());
+                    assertThat(repositoriesService.repository(repoName), isA(TestRepository.class));
+                })
+        );
     }
 
     private ClusterState createClusterStateWithRepo(String repoName, String repoType) {