From b2d7c10a9505fb9878991748bff2c29639dda0d6 Mon Sep 17 00:00:00 2001
From: Tanguy Leroux <tlrx.dev@gmail.com>
Date: Fri, 26 Sep 2025 11:40:00 +0200
Subject: [PATCH] [CI] Fix MergeWithFailureIT (#135447)

Wait for the store to be closed, don't assume
it happens immediately.

Closes #135443
---
 .../java/org/elasticsearch/index/engine/MergeWithFailureIT.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/engine/MergeWithFailureIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/engine/MergeWithFailureIT.java
index e72b9a2fec2e9..f801b68e48603 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/index/engine/MergeWithFailureIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/index/engine/MergeWithFailureIT.java
@@ -321,7 +321,7 @@ public void testFailedMergeDeadlock() throws Exception {
         ensureRed(indexName);
 
         // verify that the shard store is effectively closed
-        assertTrue(plugin.shardStoreClosedListener.isDone());
+        safeGet(plugin.shardStoreClosedListener);
 
         if (closingThread != null) {
             closingThread.join();