From 1b9331a06002172ed31fdd953445f07f3717e1da Mon Sep 17 00:00:00 2001 From: Bo Zhang Date: Fri, 29 Jan 2021 12:38:03 +0800 Subject: [PATCH] [SPARK-33212][FOLLOW-UP][BUILD] Fix test "built-in Hadoop version should support shaded client" for hadoop-2.7 --- .../spark/sql/hive/client/HadoopVersionInfoSuite.scala | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/hive/client/HadoopVersionInfoSuite.scala b/sql/hive/src/test/scala/org/apache/spark/sql/hive/client/HadoopVersionInfoSuite.scala index 5701a2a8d9c8d..6ada46412bf9f 100644 --- a/sql/hive/src/test/scala/org/apache/spark/sql/hive/client/HadoopVersionInfoSuite.scala +++ b/sql/hive/src/test/scala/org/apache/spark/sql/hive/client/HadoopVersionInfoSuite.scala @@ -81,7 +81,10 @@ class HadoopVersionInfoSuite extends SparkFunSuite { } } - test("SPARK-32212: built-in Hadoop version should support shaded client") { - assert(IsolatedClientLoader.supportsHadoopShadedClient(VersionInfo.getVersion)) + test("SPARK-32212: built-in Hadoop version should support shaded client if it is not hadoop 2") { + val hadoopVersion = VersionInfo.getVersion + if (!hadoopVersion.startsWith("2")) { + assert(IsolatedClientLoader.supportsHadoopShadedClient(hadoopVersion)) + } } }