diff options
author | Marcelo Vanzin <vanzin@cloudera.com> | 2015-08-28 12:33:40 -0700 |
---|---|---|
committer | Marcelo Vanzin <vanzin@cloudera.com> | 2015-08-28 12:33:40 -0700 |
commit | c53c902fa9c458200245f919067b41dde9cd9418 (patch) | |
tree | c81fe06b5b0a110b308fbdfadbe63687369f6610 /launcher/src/test | |
parent | d3f87dc39480f075170817bbd00142967a938078 (diff) | |
download | spark-c53c902fa9c458200245f919067b41dde9cd9418.tar.gz spark-c53c902fa9c458200245f919067b41dde9cd9418.tar.bz2 spark-c53c902fa9c458200245f919067b41dde9cd9418.zip |
[SPARK-9284] [TESTS] Allow all tests to run without an assembly.
This change aims at speeding up the dev cycle a little bit, by making
sure that all tests behave the same w.r.t. where the code to be tested
is loaded from. Namely, that means that tests don't rely on the assembly
anymore, rather loading all needed classes from the build directories.
The main change is to make sure all build directories (classes and test-classes)
are added to the classpath of child processes when running tests.
YarnClusterSuite required some custom code since the executors are run
differently (i.e. not through the launcher library, like standalone and
Mesos do).
I also found a couple of tests that could leak a SparkContext on failure,
and added code to handle those.
With this patch, it's possible to run the following command from a clean
source directory and have all tests pass:
mvn -Pyarn -Phadoop-2.4 -Phive-thriftserver install
Author: Marcelo Vanzin <vanzin@cloudera.com>
Closes #7629 from vanzin/SPARK-9284.
Diffstat (limited to 'launcher/src/test')
-rw-r--r-- | launcher/src/test/java/org/apache/spark/launcher/SparkLauncherSuite.java | 144 |
1 files changed, 0 insertions, 144 deletions
diff --git a/launcher/src/test/java/org/apache/spark/launcher/SparkLauncherSuite.java b/launcher/src/test/java/org/apache/spark/launcher/SparkLauncherSuite.java deleted file mode 100644 index d0c26dd056..0000000000 --- a/launcher/src/test/java/org/apache/spark/launcher/SparkLauncherSuite.java +++ /dev/null @@ -1,144 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.spark.launcher; - -import java.io.BufferedReader; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.util.Arrays; -import java.util.HashMap; -import java.util.Map; - -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import static org.junit.Assert.*; - -/** - * These tests require the Spark assembly to be built before they can be run. - */ -public class SparkLauncherSuite { - - private static final Logger LOG = LoggerFactory.getLogger(SparkLauncherSuite.class); - - @Test - public void testSparkArgumentHandling() throws Exception { - SparkLauncher launcher = new SparkLauncher() - .setSparkHome(System.getProperty("spark.test.home")); - SparkSubmitOptionParser opts = new SparkSubmitOptionParser(); - - launcher.addSparkArg(opts.HELP); - try { - launcher.addSparkArg(opts.PROXY_USER); - fail("Expected IllegalArgumentException."); - } catch (IllegalArgumentException e) { - // Expected. - } - - launcher.addSparkArg(opts.PROXY_USER, "someUser"); - try { - launcher.addSparkArg(opts.HELP, "someValue"); - fail("Expected IllegalArgumentException."); - } catch (IllegalArgumentException e) { - // Expected. - } - - launcher.addSparkArg("--future-argument"); - launcher.addSparkArg("--future-argument", "someValue"); - - launcher.addSparkArg(opts.MASTER, "myMaster"); - assertEquals("myMaster", launcher.builder.master); - - launcher.addJar("foo"); - launcher.addSparkArg(opts.JARS, "bar"); - assertEquals(Arrays.asList("bar"), launcher.builder.jars); - - launcher.addFile("foo"); - launcher.addSparkArg(opts.FILES, "bar"); - assertEquals(Arrays.asList("bar"), launcher.builder.files); - - launcher.addPyFile("foo"); - launcher.addSparkArg(opts.PY_FILES, "bar"); - assertEquals(Arrays.asList("bar"), launcher.builder.pyFiles); - - launcher.setConf("spark.foo", "foo"); - launcher.addSparkArg(opts.CONF, "spark.foo=bar"); - assertEquals("bar", launcher.builder.conf.get("spark.foo")); - } - - @Test - public void testChildProcLauncher() throws Exception { - SparkSubmitOptionParser opts = new SparkSubmitOptionParser(); - Map<String, String> env = new HashMap<String, String>(); - env.put("SPARK_PRINT_LAUNCH_COMMAND", "1"); - - SparkLauncher launcher = new SparkLauncher(env) - .setSparkHome(System.getProperty("spark.test.home")) - .setMaster("local") - .setAppResource("spark-internal") - .addSparkArg(opts.CONF, - String.format("%s=-Dfoo=ShouldBeOverriddenBelow", SparkLauncher.DRIVER_EXTRA_JAVA_OPTIONS)) - .setConf(SparkLauncher.DRIVER_EXTRA_JAVA_OPTIONS, - "-Dfoo=bar -Dtest.name=-testChildProcLauncher") - .setConf(SparkLauncher.DRIVER_EXTRA_CLASSPATH, System.getProperty("java.class.path")) - .addSparkArg(opts.CLASS, "ShouldBeOverriddenBelow") - .setMainClass(SparkLauncherTestApp.class.getName()) - .addAppArgs("proc"); - final Process app = launcher.launch(); - new Redirector("stdout", app.getInputStream()).start(); - new Redirector("stderr", app.getErrorStream()).start(); - assertEquals(0, app.waitFor()); - } - - public static class SparkLauncherTestApp { - - public static void main(String[] args) throws Exception { - assertEquals(1, args.length); - assertEquals("proc", args[0]); - assertEquals("bar", System.getProperty("foo")); - assertEquals("local", System.getProperty(SparkLauncher.SPARK_MASTER)); - } - - } - - private static class Redirector extends Thread { - - private final InputStream in; - - Redirector(String name, InputStream in) { - this.in = in; - setName(name); - setDaemon(true); - } - - @Override - public void run() { - try { - BufferedReader reader = new BufferedReader(new InputStreamReader(in, "UTF-8")); - String line; - while ((line = reader.readLine()) != null) { - LOG.warn(line); - } - } catch (Exception e) { - LOG.error("Error reading process output.", e); - } - } - - } - -} |