From f5ff9c6bbb84805647c03a280343a531610f2138 Mon Sep 17 00:00:00 2001
From: Luca Cavanna <javanna@apache.org>
Date: Tue, 3 Dec 2024 20:20:56 +0100
Subject: [PATCH] [TEST] Adjust exception type in
 SearchServiceTests#testWaitOnRefreshTimeout (#117884)

This test has been failing due to #114526, which changed the exception type to SearchTimeoutException.

Closes #115935
---
 muted-tests.yml                                               | 3 ---
 .../java/org/elasticsearch/search/SearchServiceTests.java     | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/muted-tests.yml b/muted-tests.yml
index 7bd06a6605028..7e5e7f15700f3 100644
--- a/muted-tests.yml
+++ b/muted-tests.yml
@@ -106,9 +106,6 @@ tests:
 - class: org.elasticsearch.search.StressSearchServiceReaperIT
   method: testStressReaper
   issue: https://github.com/elastic/elasticsearch/issues/115816
-- class: org.elasticsearch.search.SearchServiceTests
-  method: testWaitOnRefreshTimeout
-  issue: https://github.com/elastic/elasticsearch/issues/115935
 - class: org.elasticsearch.search.SearchServiceTests
   method: testParseSourceValidation
   issue: https://github.com/elastic/elasticsearch/issues/115936
diff --git a/server/src/test/java/org/elasticsearch/search/SearchServiceTests.java b/server/src/test/java/org/elasticsearch/search/SearchServiceTests.java
index 5dc07a41b3f8c..d1ccfcbe78732 100644
--- a/server/src/test/java/org/elasticsearch/search/SearchServiceTests.java
+++ b/server/src/test/java/org/elasticsearch/search/SearchServiceTests.java
@@ -20,7 +20,6 @@
 import org.apache.lucene.store.AlreadyClosedException;
 import org.apache.lucene.util.SetOnce;
 import org.elasticsearch.ElasticsearchException;
-import org.elasticsearch.ElasticsearchTimeoutException;
 import org.elasticsearch.TransportVersion;
 import org.elasticsearch.TransportVersions;
 import org.elasticsearch.action.ActionListener;
@@ -111,6 +110,7 @@
 import org.elasticsearch.search.query.NonCountingTermQuery;
 import org.elasticsearch.search.query.QuerySearchRequest;
 import org.elasticsearch.search.query.QuerySearchResult;
+import org.elasticsearch.search.query.SearchTimeoutException;
 import org.elasticsearch.search.rank.RankBuilder;
 import org.elasticsearch.search.rank.RankDoc;
 import org.elasticsearch.search.rank.RankShardResult;
@@ -2616,7 +2616,7 @@ public void testWaitOnRefreshTimeout() {
         );
         service.executeQueryPhase(request, task, future);
 
-        ElasticsearchTimeoutException ex = expectThrows(ElasticsearchTimeoutException.class, future::actionGet);
+        SearchTimeoutException ex = expectThrows(SearchTimeoutException.class, future::actionGet);
         assertThat(ex.getMessage(), containsString("Wait for seq_no [0] refreshed timed out ["));
     }