not2_4/only removal, rename the other ~cut-release

chris-twiner · chris-twiner · commit efc76ecc8f76 · 2025-12-07T14:47:21.000+01:00
diff --git a/testing/src/main/scala/com/sparkutils/testing/TestUtils.scala b/testing/src/main/scala/com/sparkutils/testing/TestUtils.scala
@@ -59,12 +59,6 @@ trait TestUtils extends SessionStrategy with Serializable with ClassicTestUtils
   def cleanupOutput(): Unit =
     cleanUp(outputDir)
 
-  /**
-   * Don't run this test on 2.4 - typically due to not being able to control code gen properly
-   */
-  def not2_4(thunk: => Unit) =
-    if (sparkVersion != "2.4") thunk
-
   /**
    * Don't run this test on 3.4 - gc's on code gen
    */
@@ -107,19 +101,12 @@ trait TestUtils extends SessionStrategy with Serializable with ClassicTestUtils
   def v4_0_and_above(thunk: => Unit) =
     if (sparkVersionNumericMajor >= 40) thunk
 
-  /**
-   * Only run this on 2.4
-   * @param thunk
-   */
-  def only2_4(thunk: => Unit) =
-    if (sparkVersion == "2.4") thunk
-
   /**
    * transform_values and transform_keys pattern match on list only which doesn't work with seq in the _lambda_ param re-writes
    * @param thunk
    */
-  def not2_4_or_3_0_or_3_1(thunk: => Unit) =
-    if (!Set("2.4", "3.0", "3.1").contains(sparkVersion)) thunk
+  def not3_0_or_3_1(thunk: => Unit) =
+    if (!Set("3.0", "3.1").contains(sparkVersion)) thunk
 
   /**
    * Assumes /dbfs existance proves running on Databricks
