From 34f6c7f9e46a656dd129057173994016b000df00 Mon Sep 17 00:00:00 2001 From: Jeff Zhang Date: Thu, 9 Feb 2017 01:16:56 +0800 Subject: [PATCH] LIVY-311. Set classpath in MiniCluster only when it is not in real cluster (#286) --- .../livy/test/framework/MiniCluster.scala | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/integration-test/src/main/scala/com/cloudera/livy/test/framework/MiniCluster.scala b/integration-test/src/main/scala/com/cloudera/livy/test/framework/MiniCluster.scala index 3cc22c24e..d520269b7 100644 --- a/integration-test/src/main/scala/com/cloudera/livy/test/framework/MiniCluster.scala +++ b/integration-test/src/main/scala/com/cloudera/livy/test/framework/MiniCluster.scala @@ -238,16 +238,16 @@ class MiniCluster(config: Map[String, String]) extends Cluster with MiniClusterU assert(tempDir.mkdir(), "Cannot create temp test dir.") sparkConfDir = mkdir("spark-conf") - val sparkScalaVersion = getSparkScalaVersion() - val classPathFile = - new File(s"minicluster-dependencies/scala-$sparkScalaVersion/target/classpath") - assert(classPathFile.isFile, - s"Cannot read MiniCluster classpath file: ${classPathFile.getCanonicalPath}") - val sparkClassPath = - FileUtils.readFileToString(classPathFile, Charset.defaultCharset()) - // When running a real Spark cluster, don't set the classpath. val extraCp = if (!isRealSpark()) { + val sparkScalaVersion = getSparkScalaVersion() + val classPathFile = + new File(s"minicluster-dependencies/scala-$sparkScalaVersion/target/classpath") + assert(classPathFile.isFile, + s"Cannot read MiniCluster classpath file: ${classPathFile.getCanonicalPath}") + val sparkClassPath = + FileUtils.readFileToString(classPathFile, Charset.defaultCharset()) + val dummyJar = Files.createTempFile(Paths.get(tempDir.toURI), "dummy", "jar").toFile Map( SparkLauncher.DRIVER_EXTRA_CLASSPATH -> sparkClassPath,