fix ut

apache · Dec 5, 2023 · a655831 · a655831
1 parent 795fc23
commit a655831
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/gluten/GlutenFallbackSuite.scala b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/gluten/GlutenFallbackSuite.scala
@@ -36,11 +36,9 @@ class GlutenFallbackSuite extends GlutenSQLTestsTrait {
           sql("SELECT * FROM t").collect()
         }
       }
-      assert(
-        testAppender.loggingEvents.exists(
-          _.getMessage.getFormattedMessage.contains(
-            "Validation failed for plan: Scan parquet default.t, " +
-              "due to: columnar FileScan is not enabled in FileSourceScanExec")))
+      val msgRegex = """Validation failed for plan: Scan parquet default\.t\[QueryId=[0-9]+\],""" +
+        """ due to: columnar FileScan is not enabled in FileSourceScanExec\."""
+      assert(testAppender.loggingEvents.exists(_.getMessage.getFormattedMessage.matches(msgRegex)))
     }
   }
 

diff --git a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/gluten/GlutenFallbackSuite.scala b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/gluten/GlutenFallbackSuite.scala
@@ -36,11 +36,9 @@ class GlutenFallbackSuite extends GlutenSQLTestsTrait {
           sql("SELECT * FROM t").collect()
         }
       }
-      assert(
-        testAppender.loggingEvents.exists(
-          _.getMessage.getFormattedMessage.contains(
-            "Validation failed for plan: Scan parquet default.t, " +
-              "due to: columnar FileScan is not enabled in FileSourceScanExec")))
+      val msgRegex = """Validation failed for plan: Scan parquet default\.t\[QueryId=[0-9]+\],""" +
+        """ due to: columnar FileScan is not enabled in FileSourceScanExec\."""
+      assert(testAppender.loggingEvents.exists(_.getMessage.getFormattedMessage.matches(msgRegex)))
     }
   }