Skip to content

Commit d936025

Browse files
baibaichenCopilot
andauthored
[GLUTEN-11550][UT] Enable GlutenMergeIntoDataFrameSuite and GlutenSparkSessionJobTaggingAndCancellationSuite (#11812)
These 2 suites were disabled in #11512 but actually pass with GlutenPlugin loaded (trait was correctly changed to GlutenSQLTestsTrait/GlutenTestsTrait in #11800). This is a follow-up to re-enable them after diagnosis confirmed they pass on both spark40 and spark41. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 0143f46 commit d936025

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

gluten-ut/spark40/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ class VeloxTestSettings extends BackendTestSettings {
252252
enableSuite[GlutenDataSourceV2OptionSuite]
253253
enableSuite[GlutenDataSourceV2UtilsSuite]
254254
// TODO: 4.x enableSuite[GlutenGroupBasedUpdateTableSuite] // 1 failure
255-
// TODO: 4.x enableSuite[GlutenMergeIntoDataFrameSuite] // 1 failure
255+
enableSuite[GlutenMergeIntoDataFrameSuite]
256256
enableSuite[GlutenProcedureSuite]
257257
enableSuite[GlutenPushablePredicateSuite]
258258
enableSuite[GlutenV1ReadFallbackWithCatalogSuite]
@@ -839,7 +839,7 @@ class VeloxTestSettings extends BackendTestSettings {
839839
enableSuite[GlutenSessionStateSuite]
840840
// TODO: 4.x enableSuite[GlutenSetCommandSuite] // 1 failure
841841
enableSuite[GlutenSparkSessionBuilderSuite]
842-
// TODO: 4.x enableSuite[GlutenSparkSessionJobTaggingAndCancellationSuite] // 1 failure
842+
enableSuite[GlutenSparkSessionJobTaggingAndCancellationSuite]
843843
enableSuite[GlutenTPCDSCollationQueryTestSuite]
844844
enableSuite[GlutenTPCDSModifiedPlanStabilitySuite]
845845
enableSuite[GlutenTPCDSModifiedPlanStabilityWithStatsSuite]

gluten-ut/spark41/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ class VeloxTestSettings extends BackendTestSettings {
263263
enableSuite[GlutenDataSourceV2OptionSuite]
264264
enableSuite[GlutenDataSourceV2UtilsSuite]
265265
// TODO: 4.x enableSuite[GlutenGroupBasedUpdateTableSuite] // 1 failure
266-
// TODO: 4.x enableSuite[GlutenMergeIntoDataFrameSuite] // 1 failure
266+
enableSuite[GlutenMergeIntoDataFrameSuite]
267267
enableSuite[GlutenProcedureSuite]
268268
enableSuite[GlutenPushablePredicateSuite]
269269
enableSuite[GlutenV1ReadFallbackWithCatalogSuite]
@@ -804,7 +804,7 @@ class VeloxTestSettings extends BackendTestSettings {
804804
enableSuite[GlutenSessionStateSuite]
805805
// TODO: 4.x enableSuite[GlutenSetCommandSuite] // 1 failure
806806
enableSuite[GlutenSparkSessionBuilderSuite]
807-
// TODO: 4.x enableSuite[GlutenSparkSessionJobTaggingAndCancellationSuite] // 1 failure
807+
enableSuite[GlutenSparkSessionJobTaggingAndCancellationSuite]
808808
enableSuite[GlutenTPCDSCollationQueryTestSuite]
809809
enableSuite[GlutenTPCDSModifiedPlanStabilitySuite]
810810
enableSuite[GlutenTPCDSModifiedPlanStabilityWithStatsSuite]

0 commit comments

Comments
 (0)