From 59f6a78f62f35a1a2e8dbe748a9ede62c1cda59b Mon Sep 17 00:00:00 2001 From: Armin Braun Date: Fri, 7 Feb 2025 20:23:05 +0100 Subject: [PATCH] Remove another outdated assertion from SearchQueryThenFetchAsyncActionTests Same reasoning as in 2b410c44eb8fc684d3986247a49f9696b44f2d4c, with the now weaker ordering guarantees from optimizations this assertion stopped being reliable. --- muted-tests.yml | 3 --- .../search/SearchQueryThenFetchAsyncActionTests.java | 8 ++------ 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/muted-tests.yml b/muted-tests.yml index cece04c496176..9d0320ed33cb6 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -401,9 +401,6 @@ tests: - class: org.elasticsearch.smoketest.SmokeTestMultiNodeClientYamlTestSuiteIT method: test {yaml=update/100_synthetic_source/keyword} issue: https://github.com/elastic/elasticsearch/issues/121992 -- class: org.elasticsearch.action.search.SearchQueryThenFetchAsyncActionTests - method: testBottomFieldSort - issue: https://github.com/elastic/elasticsearch/issues/121503 - class: org.elasticsearch.xpack.logsdb.LogsdbTestSuiteIT method: test {yaml=/60_synthetic_source_recovery/synthetic recovery for synthetic source mode index} issue: https://github.com/elastic/elasticsearch/issues/122026 diff --git a/server/src/test/java/org/elasticsearch/action/search/SearchQueryThenFetchAsyncActionTests.java b/server/src/test/java/org/elasticsearch/action/search/SearchQueryThenFetchAsyncActionTests.java index be693a2d7d294..227239481a55a 100644 --- a/server/src/test/java/org/elasticsearch/action/search/SearchQueryThenFetchAsyncActionTests.java +++ b/server/src/test/java/org/elasticsearch/action/search/SearchQueryThenFetchAsyncActionTests.java @@ -219,12 +219,8 @@ protected void run() { if (withScroll) { assertFalse(canReturnNullResponse.get()); assertThat(numWithTopDocs.get(), equalTo(0)); - } else { - if (withCollapse) { - assertThat(numWithTopDocs.get(), equalTo(0)); - } else { - assertThat(numWithTopDocs.get(), greaterThanOrEqualTo(1)); - } + } else if (withCollapse) { + assertThat(numWithTopDocs.get(), equalTo(0)); } SearchPhaseController.ReducedQueryPhase phase = action.results.reduce(); assertThat(phase.numReducePhases(), greaterThanOrEqualTo(1));