Skip to content

[SPARK-25337][SQL][TEST] runSparkSubmit should provide non-testing mode #22340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dongjoon-hyun wants to merge 1 commit into from
Closed

[SPARK-25337][SQL][TEST] runSparkSubmit should provide non-testing mode #22340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveExternalCatalogVersionsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ class HiveExternalCatalogVersionsSuite extends SparkSubmitTestUtils {
"--conf", s"spark.sql.test.version.index=$index",
"--driver-java-options", s"-Dderby.system.home=${wareHousePath.getCanonicalPath}",
tempPyFile.getCanonicalPath)
runSparkSubmit(args, Some(sparkHome.getCanonicalPath))
runSparkSubmit(args, Some(sparkHome.getCanonicalPath), false)
}

tempPyFile.delete()
Expand Down
14 changes: 12 additions & 2 deletions sql/hive/src/test/scala/org/apache/spark/sql/hive/SparkSubmitTestUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,10 @@ trait SparkSubmitTestUtils extends SparkFunSuite with TimeLimits {

// NOTE: This is an expensive operation in terms of time (10 seconds+). Use sparingly.
// This is copied from org.apache.spark.deploy.SparkSubmitSuite
protected def runSparkSubmit(args: Seq[String], sparkHomeOpt: Option[String] = None): Unit = {
protected def runSparkSubmit(
args: Seq[String],
sparkHomeOpt: Option[String] = None,
isSparkTesting: Boolean = true): Unit = {
val sparkHome = sparkHomeOpt.getOrElse(
sys.props.getOrElse("spark.test.home", fail("spark.test.home is not set!")))
val history = ArrayBuffer.empty[String]
Expand All @@ -53,7 +56,14 @@ trait SparkSubmitTestUtils extends SparkFunSuite with TimeLimits {

val builder = new ProcessBuilder(commands: _*).directory(new File(sparkHome))
val env = builder.environment()
env.put("SPARK_TESTING", "1")
if (isSparkTesting) {
env.put("SPARK_TESTING", "1")
} else {
env.remove("SPARK_TESTING")
env.remove("SPARK_SQL_TESTING")
env.remove("SPARK_PREPEND_CLASSES")
env.remove("SPARK_DIST_CLASSPATH")
}
env.put("SPARK_HOME", sparkHome)

def captureOutput(source: String)(line: String): Unit = {
Expand Down