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 2019/09/25 01:32:48 UTC
[zeppelin] branch branch-0.8 updated: [HOTFIX] Fix test failure
This is an automated email from the ASF dual-hosted git repository.
zjffdu pushed a commit to branch branch-0.8
in repository https://gitbox.apache.org/repos/asf/zeppelin.git
The following commit(s) were added to refs/heads/branch-0.8 by this push:
new 9148b8f [HOTFIX] Fix test failure
9148b8f is described below
commit 9148b8f4aca553c147a90d09757bbf64ac82391a
Author: Jeff Zhang <zj...@apache.org>
AuthorDate: Tue Sep 24 17:42:43 2019 +0800
[HOTFIX] Fix test failure
(cherry picked from commit 455bfc41c64f6406351299d4d6c53ee612ccb503)
---
.../test/java/org/apache/zeppelin/spark/SparkShimsTest.java | 2 +-
.../src/main/scala/org/apache/zeppelin/spark/SparkShims.java | 10 ++++------
.../test/java/org/apache/zeppelin/notebook/ParagraphTest.java | 6 +++---
3 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/spark/interpreter/src/test/java/org/apache/zeppelin/spark/SparkShimsTest.java b/spark/interpreter/src/test/java/org/apache/zeppelin/spark/SparkShimsTest.java
index 361fd8d..fefb830 100644
--- a/spark/interpreter/src/test/java/org/apache/zeppelin/spark/SparkShimsTest.java
+++ b/spark/interpreter/src/test/java/org/apache/zeppelin/spark/SparkShimsTest.java
@@ -117,7 +117,7 @@ public class SparkShimsTest {
.when(mockRemoteEventClientWrapper)
.onParaInfosReceived(anyString(), anyString(), argumentCaptor.capture());
- when(mockProperties.getProperty("spark.jobGroup.id")).thenReturn("job-note-paragraph");
+ when(mockProperties.getProperty("spark.jobGroup.id")).thenReturn("zeppelin-user1-note-paragraph");
try {
sparkShims = SparkShims.getInstance(SparkVersion.SPARK_2_0_0.toString(), new Properties());
diff --git a/spark/spark-shims/src/main/scala/org/apache/zeppelin/spark/SparkShims.java b/spark/spark-shims/src/main/scala/org/apache/zeppelin/spark/SparkShims.java
index 12464b5..f8e7d8c 100644
--- a/spark/spark-shims/src/main/scala/org/apache/zeppelin/spark/SparkShims.java
+++ b/spark/spark-shims/src/main/scala/org/apache/zeppelin/spark/SparkShims.java
@@ -93,15 +93,13 @@ public abstract class SparkShims {
public abstract void setupSparkListener(String master, String sparkWebUrl);
protected String getNoteId(String jobgroupId) {
- int indexOf = jobgroupId.indexOf("-");
- int secondIndex = jobgroupId.indexOf("-", indexOf + 1);
- return jobgroupId.substring(indexOf + 1, secondIndex);
+ String[] tokens = jobgroupId.split("-");
+ return tokens[2];
}
protected String getParagraphId(String jobgroupId) {
- int indexOf = jobgroupId.indexOf("-");
- int secondIndex = jobgroupId.indexOf("-", indexOf + 1);
- return jobgroupId.substring(secondIndex + 1, jobgroupId.length());
+ String[] tokens = jobgroupId.split("-");
+ return tokens[3];
}
protected void buildSparkJobUrl(
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/ParagraphTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/ParagraphTest.java
index f5580a4..d2b38c8 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/ParagraphTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/ParagraphTest.java
@@ -342,11 +342,11 @@ public class ParagraphTest extends AbstractInterpreterTest {
spyParagraph.setText("val x = \"usr={user.ent}&pass={password.ent}\"");
// Credentials should only be injected when it is enabled for an interpreter
- mockInterpreter.setProperty(Constants.INJECT_CREDENTIALS, "false");
+ when(mockInterpreter.getProperty(Constants.INJECT_CREDENTIALS, "false")).thenReturn("false");
spyParagraph.jobRun();
verify(mockInterpreter).interpret(eq("val x = \"usr={user.ent}&pass={password.ent}\""), any(InterpreterContext.class));
-
- mockInterpreter.setProperty(Constants.INJECT_CREDENTIALS, "true");
+
+ when(mockInterpreter.getProperty(Constants.INJECT_CREDENTIALS, "false")).thenReturn("true");
spyParagraph.jobRun();
verify(mockInterpreter).interpret(eq("val x = \"usr=user&pass=pwd\""), any(InterpreterContext.class));
}