You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by zj...@apache.org on 2018/07/27 05:25:04 UTC
zeppelin git commit: [HOTFIX] Fix unit test of branch-0.8
Repository: zeppelin
Updated Branches:
refs/heads/branch-0.8 68b2e57b1 -> 3699b696b
[HOTFIX] Fix unit test of branch-0.8
(cherry picked from commit 8c912c2387221f8815f9304df2beb4bcfb7b14e7)
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/3699b696
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/3699b696
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/3699b696
Branch: refs/heads/branch-0.8
Commit: 3699b696bab9ebcc3aeac2037b39bb07d5bb9cc4
Parents: 68b2e57
Author: Jeff Zhang <zj...@apache.org>
Authored: Thu Jul 26 10:29:48 2018 +0800
Committer: Jeff Zhang <zj...@apache.org>
Committed: Fri Jul 27 13:24:56 2018 +0800
----------------------------------------------------------------------
.travis.yml | 2 +-
.../python/PythonInterpreterPandasSqlTest.java | 21 ++++++++++++--------
.../zeppelin/spark/SparkRInterpreterTest.java | 3 +++
3 files changed, 17 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/3699b696/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 0a04458..6a45539 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -73,7 +73,7 @@ matrix:
dist: trusty
addons:
firefox: "31.0"
- env: CI="true" PYTHON="2" SCALA_VER="2.10" SPARK_VER="1.6.3" HADOOP_VER="2.6" PROFILE="-Pspark-1.6 -Phadoop2 -Phadoop-2.6 -Phelium-dev -Pexamples -Pintegration" BUILD_FLAG="package -DskipTests -DskipRat" TEST_FLAG="verify -DskipRat" TEST_PROJECTS="-pl .,zeppelin-integration -DfailIfNoTests=false"
+ env: CI="true" PYTHON="2" SCALA_VER="2.10" SPARK_VER="1.6.3" HADOOP_VER="2.6" PROFILE="-Pspark-1.6 -Phadoop2 -Phadoop-2.6 -Phelium-dev -Pexamples -Pintegration" BUILD_FLAG="install -DskipTests -DskipRat" TEST_FLAG="verify -DskipRat" TEST_PROJECTS="-pl .,zeppelin-integration -DfailIfNoTests=false"
# Test interpreter modules
- jdk: "openjdk7"
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/3699b696/python/src/test/java/org/apache/zeppelin/python/PythonInterpreterPandasSqlTest.java
----------------------------------------------------------------------
diff --git a/python/src/test/java/org/apache/zeppelin/python/PythonInterpreterPandasSqlTest.java b/python/src/test/java/org/apache/zeppelin/python/PythonInterpreterPandasSqlTest.java
index d8f41c4..c462d2e 100644
--- a/python/src/test/java/org/apache/zeppelin/python/PythonInterpreterPandasSqlTest.java
+++ b/python/src/test/java/org/apache/zeppelin/python/PythonInterpreterPandasSqlTest.java
@@ -39,6 +39,7 @@ import org.apache.zeppelin.interpreter.InterpreterOutput;
import org.apache.zeppelin.interpreter.InterpreterOutputListener;
import org.apache.zeppelin.interpreter.InterpreterResult;
import org.apache.zeppelin.interpreter.InterpreterResult.Type;
+import org.apache.zeppelin.interpreter.InterpreterResultMessage;
import org.apache.zeppelin.interpreter.InterpreterResultMessageOutput;
import org.apache.zeppelin.resource.LocalResourcePool;
import org.apache.zeppelin.user.AuthenticationInfo;
@@ -145,10 +146,12 @@ public class PythonInterpreterPandasSqlTest implements InterpreterOutputListener
ret = sql.interpret("select name, age from df2 where age < 40", context);
//then
- assertEquals(new String(out.getOutputAt(1).toByteArray()), InterpreterResult.Code.SUCCESS, ret.code());
- assertEquals(new String(out.getOutputAt(1).toByteArray()), Type.TABLE, out.getOutputAt(1).getType());
- assertTrue(new String(out.getOutputAt(1).toByteArray()).indexOf("moon\t33") > 0);
- assertTrue(new String(out.getOutputAt(1).toByteArray()).indexOf("park\t34") > 0);
+ assertEquals(InterpreterResult.Code.SUCCESS, ret.code());
+ List<InterpreterResultMessage> outputs = out.toInterpreterResultMessage();
+ assertEquals(1, outputs.size());
+ assertEquals(Type.TABLE, outputs.get(0).getType());
+ assertTrue(outputs.get(0).getData().contains("moon\t33"));
+ assertTrue(outputs.get(0).getData().contains("park\t34"));
assertEquals(InterpreterResult.Code.SUCCESS, sql.interpret("select case when name==\"aa\" then name else name end from df2", context).code());
}
@@ -180,10 +183,12 @@ public class PythonInterpreterPandasSqlTest implements InterpreterOutputListener
// then
assertEquals(new String(out.getOutputAt(0).toByteArray()), InterpreterResult.Code.SUCCESS, ret.code());
- assertEquals(new String(out.getOutputAt(1).toByteArray()), Type.TABLE, out.getOutputAt(1).getType());
- assertTrue(new String(out.getOutputAt(1).toByteArray()).contains("index_name"));
- assertTrue(new String(out.getOutputAt(1).toByteArray()).contains("nan"));
- assertTrue(new String(out.getOutputAt(1).toByteArray()).contains("6.7"));
+ List<InterpreterResultMessage> outputs = out.toInterpreterResultMessage();
+ assertEquals(1, outputs.size());
+ assertEquals(Type.TABLE, outputs.get(0).getType());
+ assertTrue(outputs.get(0).getData().contains("index_name"));
+ assertTrue(outputs.get(0).getData().contains("nan"));
+ assertTrue(outputs.get(0).getData().contains("6.7"));
}
@Override
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/3699b696/spark/interpreter/src/test/java/org/apache/zeppelin/spark/SparkRInterpreterTest.java
----------------------------------------------------------------------
diff --git a/spark/interpreter/src/test/java/org/apache/zeppelin/spark/SparkRInterpreterTest.java b/spark/interpreter/src/test/java/org/apache/zeppelin/spark/SparkRInterpreterTest.java
index 53f29c3..a326085 100644
--- a/spark/interpreter/src/test/java/org/apache/zeppelin/spark/SparkRInterpreterTest.java
+++ b/spark/interpreter/src/test/java/org/apache/zeppelin/spark/SparkRInterpreterTest.java
@@ -22,6 +22,7 @@ import org.apache.zeppelin.display.GUI;
import org.apache.zeppelin.interpreter.InterpreterContext;
import org.apache.zeppelin.interpreter.InterpreterException;
import org.apache.zeppelin.interpreter.InterpreterGroup;
+import org.apache.zeppelin.interpreter.InterpreterOutput;
import org.apache.zeppelin.interpreter.InterpreterResult;
import org.apache.zeppelin.interpreter.LazyOpenInterpreter;
import org.apache.zeppelin.interpreter.remote.RemoteEventClient;
@@ -67,6 +68,7 @@ public class SparkRInterpreterTest {
sparkRInterpreter.setInterpreterGroup(interpreterGroup);
sparkInterpreter.setInterpreterGroup(interpreterGroup);
+ InterpreterContext.set(getInterpreterContext());
sparkRInterpreter.open();
sparkInterpreter.getZeppelinContext().setEventClient(mockRemoteEventClient);
@@ -144,6 +146,7 @@ public class SparkRInterpreterTest {
.setNoteId("note_1")
.setParagraphId("paragraph_1")
.setEventClient(mockRemoteEventClient)
+ .setInterpreterOut(new InterpreterOutput(null))
.build();
return context;
}