dongjoon-hyun opened a new pull request, #60095: URL: https://github.com/apache/spark/pull/60095
### What changes were proposed in this pull request? This PR aims to add `gridTest` and `namedGridTest` to `SparkFunSuite` in `branch-4.0`. The two methods are the same code as `branch-4.1`, where SPARK-52405 (#51098) and SPARK-53522 (#52266) added them. `SparkFunSuite` has had them since Apache Spark [v4.1.0](https://github.com/apache/spark/releases/tag/v4.1.0) (2025-12-11), so `branch-4.0` is the only `4.x` release branch without them. ```scala protected def gridTest[A](testNamePrefix: String, testTags: Tag*)(params: Seq[A])( testFun: A => Unit): Unit = { for (param <- params) { test(testNamePrefix + s" ($param)", testTags: _*)(testFun(param)) } } protected def namedGridTest[A](testNamePrefix: String, testTags: Tag*)(params: Map[String, A])( testFun: A => Unit): Unit = { for (param <- params) { test(testNamePrefix + s" ${param._1}", testTags: _*)(testFun(param._2)) } } ``` This PR also removes the `gridTest` of `SparkConnectServiceSuite` and its unused `org.scalatest.Tag` import, as SPARK-52405 did. Otherwise, it fails to compile because it needs the `override` modifier. ### Why are the changes needed? A backport that uses `gridTest` is cherry-picked to `branch-4.0` without conflicts, but it fails to compile there. This broke the `branch-4.0` test compilation twice, and each time it needed a separate PR that replaced `gridTest` with `Seq.foreach`. - SPARK-60430 (#59680): 682e33b84d5 (2026-10-22) added `gridTest` to `RecoverySuite`. Fixed by #59698. ``` [error] .../core/src/test/scala/org/apache/spark/deploy/master/RecoverySuite.scala:516:3: not found: value gridTest ``` - SPARK-60835 (#60050): 1ff8a134385 (2026-11-04) added `gridTest` to `LabelPropagationSuite`. Fixed by #60094. ``` [error] .../graphx/src/test/scala/org/apache/spark/graphx/lib/LabelPropagationSuite.scala:45:3: not found: value gridTest [error] .../graphx/src/test/scala/org/apache/spark/graphx/lib/LabelPropagationSuite.scala:48:32: type mismatch; [error] found : Any [error] required: org.apache.spark.graphx.VertexId ``` `gridTest` is used more and more in `master` (57 test files as of today), so more backports are likely to break the same way. With this PR, such backports compile on `branch-4.0` as they are. The existing `Seq.foreach` code in `RecoverySuite` and `LabelPropagationSuite` is kept because it generates the same test names as `gridTest`. ### Does this PR introduce _any_ user-facing change? No, this is a test-only change. ### How was this patch tested? Pass the CIs. I also ran the following manually on `branch-4.0` with JDK 17. ``` $ build/sbt core/Test/compile graphx/Test/compile connect/Test/compile \ core/Test/scalastyle graphx/Test/scalastyle connect/Test/scalastyle \ 'graphx/testOnly *LabelPropagationSuite' \ 'connect/testOnly *SparkConnectServiceSuite -- -z SPARK-43923' ... [info] scalastyle Found 0 errors ... [info] scalastyle Found 0 errors ... [info] scalastyle Found 0 errors ... [info] Tests: succeeded 5, failed 0, canceled 0, ignored 0, pending 0 [info] All tests passed. ... [info] Tests: succeeded 12, failed 0, canceled 0, ignored 0, pending 0 [info] All tests passed. ``` To check that this PR prevents the breakage, I also applied the `SparkFunSuite` change to 1ff8a134385, before #60094, and ran `LabelPropagationSuite` with its original `gridTest` call. It compiled and passed with the same test names. ``` [info] - Label propagation breaks label ties with the lowest vertex ID ((1,2)) (121 milliseconds) [info] - Label propagation breaks label ties with the lowest vertex ID ((-2,-1)) (109 milliseconds) [info] - Label propagation breaks label ties with the lowest vertex ID ((-9223372036854775808,9223372036854775807)) (107 milliseconds) ... [info] Tests: succeeded 5, failed 0, canceled 0, ignored 0, pending 0 ``` ### Was this patch authored or co-authored using generative AI tooling? Generated-by: Claude Opus 5.5 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
