Skip to content

Commit 957e40d

Browse files
committed
add ut for archives
1 parent 085ee2c commit 957e40d

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

core/src/test/scala/org/apache/spark/deploy/SparkSubmitSuite.scala

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1814,6 +1814,7 @@ class SparkSubmitSuite
18141814
val testFile = "test_metrics_config.properties"
18151815
val testPyFile = "test_metrics_system.properties"
18161816
val testJar = "TestUDTF.jar"
1817+
val testArchives = "log4j2.properties"
18171818
val clArgs = Seq(
18181819
"--deploy-mode", "client",
18191820
"--proxy-user", "test.user",
@@ -1827,19 +1828,21 @@ class SparkSubmitSuite
18271828
"--files", s"src/test/resources/$testFile",
18281829
"--py-files", s"src/test/resources/$testPyFile",
18291830
"--jars", s"src/test/resources/$testJar",
1831+
"--archives", s"src/test/resources/$testArchives",
18301832
"/home/thejar.jar",
18311833
"arg1")
18321834
val appArgs = new SparkSubmitArguments(clArgs)
18331835
val _ = submit.prepareSubmitEnvironment(appArgs)
18341836

1835-
appArgs.files should be (s"file:${Paths.get(testFile).toAbsolutePath}," +
1836-
s"file:${Paths.get(testPyFile).toAbsolutePath}")
1837-
appArgs.pyFiles should be (s"file:${Paths.get(testPyFile).toAbsolutePath}")
1838-
appArgs.jars should be (s"file:${Paths.get(testJar).toAbsolutePath}")
1837+
appArgs.files should be (Utils.resolveURIs(s"$testFile,$testPyFile"))
1838+
appArgs.pyFiles should be (Utils.resolveURIs(testPyFile))
1839+
appArgs.jars should be (Utils.resolveURIs(testJar))
1840+
appArgs.archives should be (Utils.resolveURIs(s"src/test/resources/$testArchives"))
18391841

18401842
Files.delete(Paths.get(testFile))
18411843
Files.delete(Paths.get(testPyFile))
18421844
Files.delete(Paths.get(testJar))
1845+
Files.delete(Paths.get(testArchives))
18431846
}
18441847

18451848
// Requires Python dependencies for Spark Connect. Should be enabled by default.

0 commit comments

Comments
 (0)