more test fixes

Author: ChrisHegarty

server/src/test/java/org/elasticsearch/search/query/QueryPhaseTests.java

@@ -568,12 +568,13 @@ public void testTerminateAfterWithHitsNoHitCountShortcut() throws Exception {
             // size is lower than terminate_after
             context.setSize(5);
             // track_total_hits is lower than terminate_after
-            context.trackTotalHitsUpTo(randomIntBetween(1, 6));
+            int trackTotalHits = randomIntBetween(1, 6);
+            context.trackTotalHitsUpTo(trackTotalHits);
             QueryPhase.executeQuery(context);
             // depending on docs distribution we may or may not be able to honor terminate_after: low scoring hits are skipped via
             // setMinCompetitiveScore, which bypasses terminate_after until the next leaf collector is pulled, when that happens.
             assertThat(context.queryResult().terminatedEarly(), either(is(true)).or(is(false)));
-            assertThat(context.queryResult().topDocs().topDocs.totalHits.value(), equalTo(7L));
+            assertThat(context.queryResult().topDocs().topDocs.totalHits.value(), greaterThanOrEqualTo((long) trackTotalHits));
             assertThat(context.queryResult().topDocs().topDocs.totalHits.relation(), equalTo(TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO));
             assertThat(context.queryResult().topDocs().topDocs.scoreDocs.length, equalTo(5));
         }