Skip to content

Commit 0105b3f

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

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

muted-tests.yml

-3
Original file line numberDiff line numberDiff line change
@@ -246,9 +246,6 @@ tests:
246246
- class: org.elasticsearch.packaging.test.DockerTests
247247
method: test151MachineDependentHeapWithSizeOverride
248248
issue: https://github.com/elastic/elasticsearch/issues/123437
249-
- class: org.elasticsearch.action.search.SearchQueryThenFetchAsyncActionTests
250-
method: testBottomFieldSort
251-
issue: https://github.com/elastic/elasticsearch/issues/122911
252249
- class: org.elasticsearch.smoketest.DocsClientYamlTestSuiteIT
253250
method: test {yaml=reference/cat/nodes/line_361}
254251
issue: https://github.com/elastic/elasticsearch/issues/124103

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

+2-6
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)