Skip to content

Commit 5461365

Browse files
Remove another outdated assertion from SearchQueryThenFetchAsyncActionTests (#122086)
Same reasoning as in 2b410c4, with the now weaker ordering guarantees from optimizations this assertion stopped being reliable.
1 parent 33a2bc9 commit 5461365

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

muted-tests.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -343,9 +343,6 @@ tests:
343343
issue: https://github.com/elastic/elasticsearch/issues/121625
344344
- class: org.elasticsearch.xpack.searchablesnapshots.hdfs.SecureHdfsSearchableSnapshotsIT
345345
issue: https://github.com/elastic/elasticsearch/issues/121967
346-
- class: org.elasticsearch.action.search.SearchQueryThenFetchAsyncActionTests
347-
method: testBottomFieldSort
348-
issue: https://github.com/elastic/elasticsearch/issues/121503
349346
- class: org.elasticsearch.xpack.application.CohereServiceUpgradeIT
350347
issue: https://github.com/elastic/elasticsearch/issues/121537
351348
- class: org.elasticsearch.xpack.restart.FullClusterRestartIT

server/src/test/java/org/elasticsearch/action/search/SearchQueryThenFetchAsyncActionTests.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -219,12 +219,8 @@ protected void run() {
219219
if (withScroll) {
220220
assertFalse(canReturnNullResponse.get());
221221
assertThat(numWithTopDocs.get(), equalTo(0));
222-
} else {
223-
if (withCollapse) {
224-
assertThat(numWithTopDocs.get(), equalTo(0));
225-
} else {
226-
assertThat(numWithTopDocs.get(), greaterThanOrEqualTo(1));
227-
}
222+
} else if (withCollapse) {
223+
assertThat(numWithTopDocs.get(), equalTo(0));
228224
}
229225
SearchPhaseController.ReducedQueryPhase phase = action.results.reduce();
230226
assertThat(phase.numReducePhases(), greaterThanOrEqualTo(1));

0 commit comments

Comments
 (0)