diff options
Diffstat (limited to 'launcher/src/test/java')
-rw-r--r-- | launcher/src/test/java/org/apache/spark/launcher/CommandBuilderUtilsSuite.java | 36 | ||||
-rw-r--r-- | launcher/src/test/java/org/apache/spark/launcher/SparkSubmitCommandBuilderSuite.java | 8 |
2 files changed, 1 insertions, 43 deletions
diff --git a/launcher/src/test/java/org/apache/spark/launcher/CommandBuilderUtilsSuite.java b/launcher/src/test/java/org/apache/spark/launcher/CommandBuilderUtilsSuite.java index caeeea5ec6..9795041233 100644 --- a/launcher/src/test/java/org/apache/spark/launcher/CommandBuilderUtilsSuite.java +++ b/launcher/src/test/java/org/apache/spark/launcher/CommandBuilderUtilsSuite.java @@ -99,42 +99,6 @@ public class CommandBuilderUtilsSuite { assertEquals(10, javaMajorVersion("10")); } - @Test - public void testAddPermGenSizeOpt() { - List<String> cmd = new ArrayList<>(); - - if (javaMajorVersion(System.getProperty("java.version")) > 7) { - // Does nothing in Java 8 - addPermGenSizeOpt(cmd); - assertEquals(0, cmd.size()); - cmd.clear(); - - } else { - addPermGenSizeOpt(cmd); - assertEquals(1, cmd.size()); - assertTrue(cmd.get(0).startsWith("-XX:MaxPermSize=")); - cmd.clear(); - - cmd.add("foo"); - addPermGenSizeOpt(cmd); - assertEquals(2, cmd.size()); - assertTrue(cmd.get(1).startsWith("-XX:MaxPermSize=")); - cmd.clear(); - - cmd.add("-XX:MaxPermSize=512m"); - addPermGenSizeOpt(cmd); - assertEquals(1, cmd.size()); - assertEquals("-XX:MaxPermSize=512m", cmd.get(0)); - cmd.clear(); - - cmd.add("'-XX:MaxPermSize=512m'"); - addPermGenSizeOpt(cmd); - assertEquals(1, cmd.size()); - assertEquals("'-XX:MaxPermSize=512m'", cmd.get(0)); - cmd.clear(); - } - } - private static void testOpt(String opts, List<String> expected) { assertEquals(String.format("test string failed to parse: [[ %s ]]", opts), expected, parseOptionString(opts)); diff --git a/launcher/src/test/java/org/apache/spark/launcher/SparkSubmitCommandBuilderSuite.java b/launcher/src/test/java/org/apache/spark/launcher/SparkSubmitCommandBuilderSuite.java index ad2e7a70c4..d569b6688d 100644 --- a/launcher/src/test/java/org/apache/spark/launcher/SparkSubmitCommandBuilderSuite.java +++ b/launcher/src/test/java/org/apache/spark/launcher/SparkSubmitCommandBuilderSuite.java @@ -233,7 +233,7 @@ public class SparkSubmitCommandBuilderSuite extends BaseSuite { launcher.setPropertiesFile(dummyPropsFile.getAbsolutePath()); launcher.conf.put(SparkLauncher.DRIVER_MEMORY, "1g"); launcher.conf.put(SparkLauncher.DRIVER_EXTRA_CLASSPATH, "/driver"); - launcher.conf.put(SparkLauncher.DRIVER_EXTRA_JAVA_OPTIONS, "-Ddriver -XX:MaxPermSize=256m"); + launcher.conf.put(SparkLauncher.DRIVER_EXTRA_JAVA_OPTIONS, "-Ddriver"); launcher.conf.put(SparkLauncher.DRIVER_EXTRA_LIBRARY_PATH, "/native"); } else { launcher.childEnv.put("SPARK_CONF_DIR", System.getProperty("spark.test.home") @@ -258,12 +258,6 @@ public class SparkSubmitCommandBuilderSuite extends BaseSuite { assertFalse("Memory arguments should not be set.", found); } - for (String arg : cmd) { - if (arg.startsWith("-XX:MaxPermSize=")) { - assertEquals("-XX:MaxPermSize=256m", arg); - } - } - String[] cp = findArgValue(cmd, "-cp").split(Pattern.quote(File.pathSeparator)); if (isDriver) { assertTrue("Driver classpath should contain provided entry.", contains("/driver", cp)); |