[zeppelin] branch master updated: [hotfix] Fix spark test failure

[zjffdu]

This is an automated email from the ASF dual-hosted git repository.

zjffdu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zeppelin.git


The following commit(s) were added to refs/heads/master by this push:
     new 9dc203c  [hotfix] Fix spark test failure
9dc203c is described below

commit 9dc203cbd1edc5c1672ece39940da2311ca70664
Author: Jeff Zhang <zjf...@apache.org>
AuthorDate: Sun Oct 11 07:54:58 2020 +0800

    [hotfix] Fix spark test failure
---
 .../src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java | 6 +++++-
 .../test/java/org/apache/zeppelin/spark/SparkInterpreterTest.java | 8 +++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git 
a/spark/interpreter/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
 
b/spark/interpreter/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
index fc0a2c1..4a1f59e 100644
--- 
a/spark/interpreter/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
+++ 
b/spark/interpreter/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
@@ -254,7 +254,11 @@ public class SparkInterpreter extends AbstractInterpreter {
   }
 
   public boolean isScala212() throws InterpreterException {
-    return extractScalaVersion().contains("2.12");
+    return extractScalaVersion().equals("2.12");
+  }
+
+  public boolean isScala210() throws InterpreterException {
+    return extractScalaVersion().equals("2.10");
   }
 
   private List<String> getDependencyFiles() throws InterpreterException {
diff --git 
a/spark/interpreter/src/test/java/org/apache/zeppelin/spark/SparkInterpreterTest.java
 
b/spark/interpreter/src/test/java/org/apache/zeppelin/spark/SparkInterpreterTest.java
index 461eeaf..9b42f6a 100644
--- 
a/spark/interpreter/src/test/java/org/apache/zeppelin/spark/SparkInterpreterTest.java
+++ 
b/spark/interpreter/src/test/java/org/apache/zeppelin/spark/SparkInterpreterTest.java
@@ -136,9 +136,11 @@ public class SparkInterpreterTest {
     result = interpreter.interpret("/*line 1 \n line 2*/print(\"hello 
world\")", getInterpreterContext());
     assertEquals(InterpreterResult.Code.SUCCESS, result.code());
 
-    // test $intp
-    result = interpreter.interpret("$intp", getInterpreterContext());
-    assertEquals(InterpreterResult.Code.SUCCESS, result.code());
+    // test $intp, only works for scala after 2.11
+    if (!interpreter.isScala210()) {
+      result = interpreter.interpret("$intp", getInterpreterContext());
+      assertEquals(InterpreterResult.Code.SUCCESS, result.code());
+    }
 
     // Companion object with case class
     result = interpreter.interpret("import scala.math._\n" +