Skip to content

Commit 59f6a78

Browse files
Remove another outdated assertion from SearchQueryThenFetchAsyncActionTests
Same reasoning as in 2b410c4, with the now weaker ordering guarantees from optimizations this assertion stopped being reliable.
1 parent b6facb2 commit 59f6a78

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
@@ -401,9 +401,6 @@ tests:
401401
- class: org.elasticsearch.smoketest.SmokeTestMultiNodeClientYamlTestSuiteIT
402402
method: test {yaml=update/100_synthetic_source/keyword}
403403
issue: https://github.com/elastic/elasticsearch/issues/121992
404-
- class: org.elasticsearch.action.search.SearchQueryThenFetchAsyncActionTests
405-
method: testBottomFieldSort
406-
issue: https://github.com/elastic/elasticsearch/issues/121503
407404
- class: org.elasticsearch.xpack.logsdb.LogsdbTestSuiteIT
408405
method: test {yaml=/60_synthetic_source_recovery/synthetic recovery for synthetic source mode index}
409406
issue: https://github.com/elastic/elasticsearch/issues/122026

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)