Skip to content

[SPARK-32443][CORE] Use POSIX-compatible command -v in testCommandAvailable #29241

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 12 commits into from
Closed

[SPARK-32443][CORE] Use POSIX-compatible command -v in testCommandAvailable #29241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
789edde
[SPARK-32443][CORE] Use POSIX compatible `command -v` in testCommandA…
dongjoon-hyun Jul 26, 2020
62e5e6e
test
dongjoon-hyun Jul 26, 2020
7e472c7
Check pythonExec
dongjoon-hyun Jul 26, 2020
5d6e149
a
dongjoon-hyun Jul 26, 2020
d9f5949
fix typo
dongjoon-hyun Jul 26, 2020
e549e19
remove extra assumes
dongjoon-hyun Jul 26, 2020
dd0888d
always python3
dongjoon-hyun Jul 26, 2020
1333a7f
test
dongjoon-hyun Jul 27, 2020
46abc40
clean up
dongjoon-hyun Jul 27, 2020
acf87a2
Use the old behavior for Windows
dongjoon-hyun Jul 27, 2020
0bf0773
empty commit
dongjoon-hyun Jul 27, 2020
c7154c9
Quick try
HyukjinKwon Jul 27, 2020
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
8 changes: 7 additions & 1 deletion core/src/main/scala/org/apache/spark/TestUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,13 @@ private[spark] object TestUtils {
* Test if a command is available.
*/
def testCommandAvailable(command: String): Boolean = {
val attempt = Try(Process(command).run(ProcessLogger(_ => ())).exitValue())
val attempt = if (Utils.isWindows) {
Try(Process(Seq(
"cmd.exe", "/C", s"where $command")).run(ProcessLogger(_ => ())).exitValue())
} else {
Try(Process(Seq(
"sh", "-c", s"command -v $command")).run(ProcessLogger(_ => ())).exitValue())
}
attempt.isSuccess && attempt.get == 0
}

Expand Down
6 changes: 4 additions & 2 deletions core/src/test/scala/org/apache/spark/rdd/PipedRDDSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,8 @@ class PipedRDDSuite extends SparkFunSuite with SharedSparkContext with Eventuall
}

test("pipe with env variable") {
assume(TestUtils.testCommandAvailable(envCommand))
val executable = envCommand.split("\\s+", 2)(0)
assume(TestUtils.testCommandAvailable(executable))
val nums = sc.makeRDD(Array(1, 2, 3, 4), 2)
val piped = nums.pipe(s"$envCommand MY_TEST_ENV", Map("MY_TEST_ENV" -> "LALALA"))
val c = piped.collect()
Expand Down Expand Up @@ -238,7 +239,8 @@ class PipedRDDSuite extends SparkFunSuite with SharedSparkContext with Eventuall
}

def testExportInputFile(varName: String): Unit = {
assume(TestUtils.testCommandAvailable(envCommand))
val executable = envCommand.split("\\s+", 2)(0)
assume(TestUtils.testCommandAvailable(executable))
val nums = new HadoopRDD(sc, new JobConf(), classOf[TextInputFormat], classOf[LongWritable],
classOf[Text], 2) {
override def getPartitions: Array[Partition] = Array(generateFakeHadoopPartition())
Expand Down
3 changes: 2 additions & 1 deletion sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/SQLQuerySuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,8 @@ abstract class SQLQuerySuiteBase extends QueryTest with SQLTestUtils with TestHi
test("script") {
withTempView("script_table") {
assume(TestUtils.testCommandAvailable("/bin/bash"))
assume(TestUtils.testCommandAvailable("echo | sed"))
assume(TestUtils.testCommandAvailable("echo"))
assume(TestUtils.testCommandAvailable("sed"))
val scriptFilePath = getTestResourcePath("test_script.sh")
val df = Seq(("x1", "y1", "z1"), ("x2", "y2", "z2")).toDF("c1", "c2", "c3")
df.createOrReplaceTempView("script_table")
Expand Down