Fixup tests

Author: nik9000

x-pack/plugin/esql/qa/server/multi-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClusterSpecIT.java

@@ -302,4 +302,10 @@ protected boolean supportsIndexModeLookup() throws IOException {
     protected boolean supportsSourceFieldMapping() {
         return false;
     }
+
+    @Override
+    protected boolean supportsTook() throws IOException {
+        // We don't read took properly in multi-cluster tests.
+        return false;
+    }
 }

x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/EsqlSpecTestCase.java

@@ -92,6 +92,7 @@ public abstract class EsqlSpecTestCase extends ESRestTestCase {
     protected final CsvTestCase testCase;
     protected final String instructions;
     protected final Mode mode;
+    protected static Boolean supportsTook;
 
     public enum Mode {
         SYNC,
@@ -272,7 +273,7 @@ protected final void doTest() throws Throwable {
             builder.tables(tables());
         }
 
-        Map<?, ?> prevTooks = tooks();
+        Map<?, ?> prevTooks = supportsTook() ? tooks() : null;
         Map<String, Object> answer = runEsql(builder.query(testCase.query), testCase.assertWarnings(deduplicateExactWarnings()));
 
         var expectedColumnsWithValues = loadCsvSpecValues(testCase.expectedResults);
@@ -290,9 +291,12 @@ protected final void doTest() throws Throwable {
 
         assertResults(expectedColumnsWithValues, actualColumns, actualValues, testCase.ignoreOrder, logger);
 
-        long took = ((Number) answer.get("took")).longValue();
-        int prevTookHisto = ((Number) prevTooks.remove(tookKey(took))).intValue();
-        assertMap(tooks(), matchesMap(prevTooks).entry(tookKey(took), prevTookHisto + 1));
+        if (supportsTook()) {
+            LOGGER.info("checking took incremented from {}", prevTooks);
+            long took = ((Number) answer.get("took")).longValue();
+            int prevTookHisto = ((Number) prevTooks.remove(tookKey(took))).intValue();
+            assertMap(tooks(), matchesMap(prevTooks).entry(tookKey(took), prevTookHisto + 1));
+        }
     }
 
     private Map<?, ?> tooks() throws IOException {
@@ -486,6 +490,13 @@ private Map<String, Map<String, RestEsqlTestCase.TypeAndValues>> tables() {
         return tables;
     }
 
+    protected boolean supportsTook() throws IOException {
+        if (supportsTook == null) {
+            supportsTook = hasCapabilities(client(), List.of("usage_contains_took"));
+        }
+        return supportsTook;
+    }
+
     private String tookKey(long took) {
         if (took < 10) {
             return "lt_10ms";