From 3b9a9cdbd828eb57df806d8b750e6ec547ca12c2 Mon Sep 17 00:00:00 2001
From: Craig Taverner <craig@amanzi.com>
Date: Fri, 25 Oct 2024 13:38:35 +0200
Subject: [PATCH] Fixed flaky test after PR that disallows functions to return
 TEXT (#115633)

* Fixed flaky test after PR that disallows functions to return TEXT

* Also ignore TEXT/KEYWORD combinations because they are now valid

* Unmute the test
---
 muted-tests.yml                                           | 3 ---
 .../elasticsearch/xpack/esql/analysis/AnalyzerTests.java  | 8 +++++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/muted-tests.yml b/muted-tests.yml
index 4869b669f6220..5c94c0aff60b6 100644
--- a/muted-tests.yml
+++ b/muted-tests.yml
@@ -282,9 +282,6 @@ tests:
 - class: org.elasticsearch.oldrepos.OldRepositoryAccessIT
   method: testOldRepoAccess
   issue: https://github.com/elastic/elasticsearch/issues/115631
-- class: org.elasticsearch.xpack.esql.analysis.AnalyzerTests
-  method: testMvAppendValidation
-  issue: https://github.com/elastic/elasticsearch/issues/115636
 
 # Examples:
 #
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/AnalyzerTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/AnalyzerTests.java
index c18f55a651408..b86935dcd03da 100644
--- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/AnalyzerTests.java
+++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/AnalyzerTests.java
@@ -56,6 +56,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
@@ -1879,6 +1880,11 @@ public void testMvAppendValidation() {
         Supplier<Integer> supplier = () -> randomInt(fields.length - 1);
         int first = supplier.get();
         int second = randomValueOtherThan(first, supplier);
+        Function<String, String> noText = (type) -> type.equals("text") ? "keyword" : type;
+        assumeTrue(
+            "Ignore tests with TEXT and KEYWORD combinations because they are now valid",
+            noText.apply(fields[first][0]).equals(noText.apply(fields[second][0])) == false
+        );
 
         String signature = "mv_append(" + fields[first][0] + ", " + fields[second][0] + ")";
         verifyUnsupported(
@@ -1886,7 +1892,7 @@ public void testMvAppendValidation() {
             "second argument of ["
                 + signature
                 + "] must be ["
-                + fields[first][1]
+                + noText.apply(fields[first][1])
                 + "], found value ["
                 + fields[second][0]
                 + "] type ["