Skip to content

Commit 5c7c658

Browse files
committed
disable EngineTabSuite for spark 4.2+
1 parent ca25ffb commit 5c7c658

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed

externals/kyuubi-spark-sql-engine/src/test/scala/org/apache/spark/ui/EngineTabSuite.scala

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,31 @@ package org.apache.spark.ui
2020
import org.apache.http.client.methods.HttpGet
2121
import org.apache.http.impl.client.HttpClients
2222
import org.apache.http.util.EntityUtils
23+
import org.apache.spark.SPARK_VERSION
24+
import org.scalactic.source.Position
25+
import org.scalatest.Tag
2326

2427
import org.apache.kyuubi.engine.spark.WithSparkSQLEngine
2528
import org.apache.kyuubi.operation.HiveJDBCTestHelper
2629
import org.apache.kyuubi.session.SessionHandle
30+
import org.apache.kyuubi.util.SemanticVersion
2731

2832
class EngineTabSuite extends WithSparkSQLEngine with HiveJDBCTestHelper {
2933
override def withKyuubiConf: Map[String, String] = Map(
3034
"spark.ui.enabled" -> "true",
3135
"spark.ui.port" -> "0",
3236
"spark.sql.redaction.string.regex" -> "(?i)url|access|secret|password")
3337

38+
override protected def test(testName: String, testTags: Tag*)(testBody: => Any)(implicit
39+
pos: Position): Unit = {
40+
// SPARK-47086 (4.2.0) Upgrade to Jetty 12 and Servlet 6.0
41+
if (SemanticVersion(SPARK_VERSION) >= "4.2") {
42+
ignore(s"$testName (excluded)")(testBody)
43+
} else {
44+
super.test(testName, testTags: _*)(testBody)
45+
}
46+
}
47+
3448
override protected def beforeEach(): Unit = {
3549
super.beforeEach()
3650
startSparkEngine()

0 commit comments

Comments
 (0)