zeppelin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zjf...@apache.org
Subject zeppelin git commit: [ZEPPELIN-3399] Tests failing with no changes - ShellScriptLauncherTest and SparkInterpreterLaunchTest
Date Wed, 18 Apr 2018 07:48:18 GMT
Repository: zeppelin
Updated Branches:
  refs/heads/master 6cb39a071 -> 2acb62e51


[ZEPPELIN-3399] Tests failing with no changes - ShellScriptLauncherTest and SparkInterpreterLaunchTest

### What is this PR for?
When I run all of the tests zeppelin-zengine in IntelliJ, the tests in ShellScriptLauncherTest
and SparkInterpreterLaunchTest fail, but if I run these tests by themselves, they pass.
There is a problem with the tests in ShellScripterLauncherTest and SparkInterpreterLaunchTest,
which is that if some of the ConfVars are set (such as ZEPPELIN_HOME) in other tests, then
these tests will fail, because they expect that these variables are not set.

To fix this, I have added a setUp() method that clears all of the ConfVars to both ShellScripterLauncherTest
and SparkInterpreterLauncherTest. This way, none of the ConfVars will be set when these tests
are run.

### What type of PR is it?
Bug Fix for tests ShellScripterLauncherTest and SparkInterpreterLauncherTest.

### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-3399

### How should this be tested?
Can verify tests still work after pull request by running them, and can verify that they failed
before by running all tests in IntelliJ in the default order that IntelliJ runs them.

Author: Reed Oei <oei.reed@gmail.com>

Closes #2918 from ReedOei/ShellScriptLauncherTest-testLauncher-fix and squashes the following
commits:

6f57ab4 [Reed Oei] Fixed tests in SparkInterpreterLauncherTest.
bcbbabd [Reed Oei] Fixed test: ShellScripterLauncherTest.testLauncher.


Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/2acb62e5
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/2acb62e5
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/2acb62e5

Branch: refs/heads/master
Commit: 2acb62e518555ae856b22beba87731a0812f840e
Parents: 6cb39a0
Author: Reed Oei <oei.reed@gmail.com>
Authored: Tue Apr 10 10:02:42 2018 -0500
Committer: Jeff Zhang <zjffdu@apache.org>
Committed: Wed Apr 18 15:48:12 2018 +0800

----------------------------------------------------------------------
 .../interpreter/launcher/ShellScriptLauncherTest.java         | 7 +++++++
 .../interpreter/launcher/SparkInterpreterLauncherTest.java    | 7 +++++++
 2 files changed, 14 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/2acb62e5/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/launcher/ShellScriptLauncherTest.java
----------------------------------------------------------------------
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/launcher/ShellScriptLauncherTest.java
b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/launcher/ShellScriptLauncherTest.java
index b7557ad..99087a5 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/launcher/ShellScriptLauncherTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/launcher/ShellScriptLauncherTest.java
@@ -20,6 +20,7 @@ package org.apache.zeppelin.interpreter.launcher;
 import org.apache.zeppelin.conf.ZeppelinConfiguration;
 import org.apache.zeppelin.interpreter.InterpreterOption;
 import org.apache.zeppelin.interpreter.remote.RemoteInterpreterManagedProcess;
+import org.junit.Before;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -29,6 +30,12 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 public class ShellScriptLauncherTest {
+  @Before
+  public void setUp() {
+    for (final ZeppelinConfiguration.ConfVars confVar : ZeppelinConfiguration.ConfVars.values())
{
+      System.clearProperty(confVar.getVarName());
+    }
+  }
 
   @Test
   public void testLauncher() throws IOException {

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/2acb62e5/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/launcher/SparkInterpreterLauncherTest.java
----------------------------------------------------------------------
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/launcher/SparkInterpreterLauncherTest.java
b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/launcher/SparkInterpreterLauncherTest.java
index eb44809..0bd79af 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/launcher/SparkInterpreterLauncherTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/launcher/SparkInterpreterLauncherTest.java
@@ -20,6 +20,7 @@ package org.apache.zeppelin.interpreter.launcher;
 import org.apache.zeppelin.conf.ZeppelinConfiguration;
 import org.apache.zeppelin.interpreter.InterpreterOption;
 import org.apache.zeppelin.interpreter.remote.RemoteInterpreterManagedProcess;
+import org.junit.Before;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -29,6 +30,12 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 public class SparkInterpreterLauncherTest {
+  @Before
+  public void setUp() {
+    for (final ZeppelinConfiguration.ConfVars confVar : ZeppelinConfiguration.ConfVars.values())
{
+      System.clearProperty(confVar.getVarName());
+    }
+  }
 
   @Test
   public void testLocalMode() throws IOException {


Mime
View raw message