Repository: zeppelin Updated Branches: refs/heads/branch-0.8 a15bdf244 -> 0ea66da83
[HOTFIX] Fix travis failure of branch-0.8 ### What is this PR for? This is for fixing the travis failure of branch-0.8 ### What type of PR is it? [Bug Fix] ### Todos * [ ] - Task ### What is the Jira issue? * No jira created ### How should this be tested? * CI pass ### Screenshots (if appropriate) ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Jeff Zhang <zjf...@apache.org> Closes #3193 from zjffdu/fix_0.8 and squashes the following commits: 92cf7a99d [Jeff Zhang] [HOTFIX] Fix travis failure of branch-0.8 Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/0ea66da8 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/0ea66da8 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/0ea66da8 Branch: refs/heads/branch-0.8 Commit: 0ea66da83ea7ba60401e8f7a6a1e0684ae1babc6 Parents: a15bdf2 Author: Jeff Zhang <zjf...@apache.org> Authored: Thu Sep 27 17:07:14 2018 +0800 Committer: Jeff Zhang <zjf...@apache.org> Committed: Fri Sep 28 12:56:22 2018 +0800 ---------------------------------------------------------------------- .travis.yml | 2 +- .../java/org/apache/zeppelin/python/IPythonInterpreterTest.java | 3 +++ .../java/org/apache/zeppelin/spark/NewSparkInterpreterTest.java | 1 + testing/install_external_dependencies.sh | 2 +- .../org/apache/zeppelin/interpreter/BaseZeppelinContext.java | 5 ++--- 5 files changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0ea66da8/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 6a45539..e1d0871 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,7 @@ addons: env: global: # Interpreters does not required by zeppelin-server integration tests - - INTERPRETERS='!hbase,!pig,!jdbc,!file,!flink,!ignite,!kylin,!lens,!cassandra,!elasticsearch,!bigquery,!alluxio,!scio,!livy,!groovy,!sap' + - INTERPRETERS='!hbase,!pig,!jdbc,!file,!flink,!ignite,!kylin,!lens,!cassandra,!elasticsearch,!bigquery,!alluxio,!scio,!livy,!groovy' matrix: include: http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0ea66da8/python/src/test/java/org/apache/zeppelin/python/IPythonInterpreterTest.java ---------------------------------------------------------------------- diff --git a/python/src/test/java/org/apache/zeppelin/python/IPythonInterpreterTest.java b/python/src/test/java/org/apache/zeppelin/python/IPythonInterpreterTest.java index 2d5d832..8eba0ce 100644 --- a/python/src/test/java/org/apache/zeppelin/python/IPythonInterpreterTest.java +++ b/python/src/test/java/org/apache/zeppelin/python/IPythonInterpreterTest.java @@ -368,6 +368,9 @@ public class IPythonInterpreterTest { Thread.sleep(100); assertEquals(InterpreterResult.Code.SUCCESS, result.code()); interpreterResultMessages = context.out.toInterpreterResultMessage(); + for (InterpreterResultMessage message : interpreterResultMessages) { + LOGGER.info("Data:" + message.getData()); + } assertEquals(2, interpreterResultMessages.size()); assertEquals(InterpreterResult.Type.HTML, interpreterResultMessages.get(0).getType()); assertTrue(interpreterResultMessages.get(0).getData().contains("Loading BokehJS")); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0ea66da8/spark/interpreter/src/test/java/org/apache/zeppelin/spark/NewSparkInterpreterTest.java ---------------------------------------------------------------------- diff --git a/spark/interpreter/src/test/java/org/apache/zeppelin/spark/NewSparkInterpreterTest.java b/spark/interpreter/src/test/java/org/apache/zeppelin/spark/NewSparkInterpreterTest.java index 4fe85db..05bb659 100644 --- a/spark/interpreter/src/test/java/org/apache/zeppelin/spark/NewSparkInterpreterTest.java +++ b/spark/interpreter/src/test/java/org/apache/zeppelin/spark/NewSparkInterpreterTest.java @@ -90,6 +90,7 @@ public class NewSparkInterpreterTest { mockRemoteEventClient = mock(RemoteEventClient.class); InterpreterContext context = InterpreterContext.builder() .setInterpreterOut(new InterpreterOutput(null)) + .setEventClient(mockRemoteEventClient) .build(); InterpreterContext.set(context); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0ea66da8/testing/install_external_dependencies.sh ---------------------------------------------------------------------- diff --git a/testing/install_external_dependencies.sh b/testing/install_external_dependencies.sh index 2847a07..605380e 100755 --- a/testing/install_external_dependencies.sh +++ b/testing/install_external_dependencies.sh @@ -45,6 +45,6 @@ if [[ -n "$PYTHON" ]] ; then conda update -q conda conda info -a conda config --add channels conda-forge - conda install -q pandas=0.21.1 matplotlib=2.1.1 pandasql=0.7.3 ipython=5.4.1 jupyter_client=5.1.0 ipykernel=4.7.0 bokeh=0.12.10 + conda install -q numpy=1.12.1 pandas=0.21.1 matplotlib=2.1.1 pandasql=0.7.3 ipython=5.4.1 jupyter_client=5.1.0 ipykernel=4.7.0 bokeh=0.12.10 pip install -q ggplot==0.11.5 grpcio==1.8.2 bkzep==0.4.0 fi http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0ea66da8/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/BaseZeppelinContext.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/BaseZeppelinContext.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/BaseZeppelinContext.java index 22fd8b5..38dca25 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/BaseZeppelinContext.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/BaseZeppelinContext.java @@ -910,8 +910,7 @@ public abstract class BaseZeppelinContext { */ @ZeppelinApi public void setEventClient(RemoteEventClientWrapper eventClient) { - if (BaseZeppelinContext.eventClient == null) { - BaseZeppelinContext.eventClient = eventClient; - } + BaseZeppelinContext.eventClient = eventClient; } + }
