Add unittest

conf/zeppelin-site.xml.template

@@ -190,7 +190,7 @@
 
 <property>
   <name>zeppelin.interpreters</name>
-  <value>org.apache.zeppelin.spark.SparkInterpreter,org.apache.zeppelin.spark.PySparkInterpreter,org.apache.zeppelin.rinterpreter.RRepl,org.apache.zeppelin.rinterpreter.KnitR,org.apache.zeppelin.spark.SparkRInterpreter,org.apache.zeppelin.spark.SparkSqlInterpreter,org.apache.zeppelin.spark.DepInterpreter,org.apache.zeppelin.markdown.Markdown,org.apache.zeppelin.angular.AngularInterpreter,org.apache.zeppelin.shell.ShellInterpreter,org.apache.zeppelin.file.HDFSFileInterpreter,org.apache.zeppelin.flink.FlinkInterpreter,,org.apache.zeppelin.python.PythonInterpreter,org.apache.zeppelin.lens.LensInterpreter,org.apache.zeppelin.ignite.IgniteInterpreter,org.apache.zeppelin.ignite.IgniteSqlInterpreter,org.apache.zeppelin.cassandra.CassandraInterpreter,org.apache.zeppelin.geode.GeodeOqlInterpreter,org.apache.zeppelin.postgresql.PostgreSqlInterpreter,org.apache.zeppelin.jdbc.JDBCInterpreter,org.apache.zeppelin.kylin.KylinInterpreter,org.apache.zeppelin.elasticsearch.ElasticsearchInterpreter,org.apache.zeppelin.scalding.ScaldingInterpreter,org.apache.zeppelin.alluxio.AlluxioInterpreter,org.apache.zeppelin.hbase.HbaseInterpreter,org.apache.zeppelin.livy.LivySparkInterpreter,org.apache.zeppelin.livy.LivyPySparkInterpreter,org.apache.zeppelin.livy.LivySparkRInterpreter,org.apache.zeppelin.livy.LivySparkSQLInterpreter,org.apache.zeppelin.bigquery.BigQueryInterpreter,org.apache.zeppelin.beam.BeamInterpreter,org.apache.zeppelin.pig.PigInterpreter,org.apache.zeppelin.pig.PigQueryInterpreter,org.apache.zeppelin.scio.ScioInterpreter</value>
+  <value>org.apache.zeppelin.spark.SparkInterpreter,org.apache.zeppelin.spark.PySparkInterpreter,org.apache.zeppelin.rinterpreter.RRepl,org.apache.zeppelin.rinterpreter.KnitR,org.apache.zeppelin.spark.SparkRInterpreter,org.apache.zeppelin.spark.SparkSqlInterpreter,org.apache.zeppelin.spark.DepInterpreter,org.apache.zeppelin.markdown.Markdown,org.apache.zeppelin.angular.AngularInterpreter,org.apache.zeppelin.shell.ShellInterpreter,org.apache.zeppelin.file.HDFSFileInterpreter,org.apache.zeppelin.flink.FlinkInterpreter,,org.apache.zeppelin.python.PythonInterpreter,org.apache.zeppelin.python.PythonInterpreterPandasSql,org.apache.zeppelin.python.PythonCondaInterpreter,org.apache.zeppelin.lens.LensInterpreter,org.apache.zeppelin.ignite.IgniteInterpreter,org.apache.zeppelin.ignite.IgniteSqlInterpreter,org.apache.zeppelin.cassandra.CassandraInterpreter,org.apache.zeppelin.geode.GeodeOqlInterpreter,org.apache.zeppelin.postgresql.PostgreSqlInterpreter,org.apache.zeppelin.jdbc.JDBCInterpreter,org.apache.zeppelin.kylin.KylinInterpreter,org.apache.zeppelin.elasticsearch.ElasticsearchInterpreter,org.apache.zeppelin.scalding.ScaldingInterpreter,org.apache.zeppelin.alluxio.AlluxioInterpreter,org.apache.zeppelin.hbase.HbaseInterpreter,org.apache.zeppelin.livy.LivySparkInterpreter,org.apache.zeppelin.livy.LivyPySparkInterpreter,org.apache.zeppelin.livy.LivySparkRInterpreter,org.apache.zeppelin.livy.LivySparkSQLInterpreter,org.apache.zeppelin.bigquery.BigQueryInterpreter,org.apache.zeppelin.beam.BeamInterpreter,org.apache.zeppelin.pig.PigInterpreter,org.apache.zeppelin.pig.PigQueryInterpreter,org.apache.zeppelin.scio.ScioInterpreter</value>
   <description>Comma separated interpreter configurations. First interpreter become a default</description>
 </property>
 

python/src/main/java/org/apache/zeppelin/python/PythonCondaInterpreter.java

@@ -87,7 +87,7 @@ public class PythonCondaInterpreter extends Interpreter {
     python.open();
   }
 
-  private PythonInterpreter getPythonInterpreter() {
+  protected PythonInterpreter getPythonInterpreter() {
     LazyOpenInterpreter lazy = null;
     PythonInterpreter python = null;
     Interpreter p = getInterpreterInTheSameSessionByClassName(PythonInterpreter.class.getName());
@@ -111,7 +111,7 @@ public class PythonCondaInterpreter extends Interpreter {
   }
 
   private void listEnv(InterpreterOutput out) {
-    StringBuilder sb = new StringBuilder();
+    StringBuilder sb = createStringBuilder();
     try {
       int exit = runCommand(sb, "conda", "env", "list");
       if (exit == 0) {
@@ -170,7 +170,7 @@ public class PythonCondaInterpreter extends Interpreter {
     return 0;
   }
 
-  private int runCommand(StringBuilder sb, String ... command)
+  protected int runCommand(StringBuilder sb, String ... command)
       throws IOException, InterruptedException {
     ProcessBuilder builder = new ProcessBuilder(command);
     builder.redirectErrorStream(true);
@@ -185,4 +185,8 @@ public class PythonCondaInterpreter extends Interpreter {
     int r = process.waitFor(); // Let the process finish.
     return r;
   }
+
+  protected StringBuilder createStringBuilder() {
+    return new StringBuilder();
+  }
 }

python/src/main/resources/output_templates/usage.html

@@ -21,7 +21,7 @@ limitations under the License.
   <pre>%python.conda deactivate</pre>
 </div>
 <div>
-    List the Conda environments
-    <pre>%python.conda</pre>
+  List the Conda environments
+  <pre>%python.conda</pre>
 </div>
 

python/src/test/java/org/apache/zeppelin/python/PythonCondaInterpreterTest.java

@@ -0,0 +1,116 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License.  You may obtain a copy of the License at
+*
+*  http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package org.apache.zeppelin.python;
+
+import org.apache.zeppelin.display.GUI;
+import org.apache.zeppelin.interpreter.*;
+import org.apache.zeppelin.user.AuthenticationInfo;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Properties;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.*;
+import static org.mockito.Mockito.*;
+
+public class PythonCondaInterpreterTest implements InterpreterOutputListener {
+  private PythonCondaInterpreter conda;
+  private PythonInterpreter python;
+
+  @Before
+  public void setUp() {
+    conda = spy(new PythonCondaInterpreter(new Properties()));
+    python = mock(PythonInterpreter.class);
+
+    InterpreterGroup group = new InterpreterGroup();
+    group.put("note", Arrays.asList(python, conda));
+    python.setInterpreterGroup(group);
+    conda.setInterpreterGroup(group);
+
+    doReturn(python).when(conda).getPythonInterpreter();
+  }
+
+  @Test
+  public void testListEnv() throws IOException, InterruptedException {
+    InterpreterContext context = getInterpreterContext();
+
+    StringBuilder sb = new StringBuilder();
+    sb.append("#comment\n\nenv1   *  /path1\nenv2\t/path2\n");
+
+    doReturn(sb).when(conda).createStringBuilder();
+    doReturn(0).when(conda)
+        .runCommand(any(StringBuilder.class), anyString(), anyString(), anyString());
+
+    // list available env
+    InterpreterResult result = conda.interpret("", context);
+    assertEquals(InterpreterResult.Code.SUCCESS, result.code());
+
+    String out = new String(context.out.toByteArray());
+    assertTrue(out.contains(">env1<"));
+    assertTrue(out.contains(">/path1<"));
+    assertTrue(out.contains(">env2<"));
+    assertTrue(out.contains(">/path2<"));
+  }
+
+  @Test
+  public void testActivateEnv() {
+    InterpreterContext context = getInterpreterContext();
+    conda.interpret("activate env", context);
+    verify(python, times(1)).open();
+    verify(python, times(1)).close();
+    assertEquals("conda run -n env \"python -iu\"", conda.getPythonCommand());
+  }
+
+  @Test
+  public void testDeactivate() {
+    InterpreterContext context = getInterpreterContext();
+    conda.interpret("deactivate", context);
+    verify(python, times(1)).open();
+    verify(python, times(1)).close();
+    assertEquals(null, conda.getPythonCommand());
+  }
+
+  private InterpreterContext getInterpreterContext() {
+    return new InterpreterContext(
+        "noteId",
+        "paragraphId",
+        "paragraphTitle",
+        "paragraphText",
+        new AuthenticationInfo(),
+        new HashMap<String, Object>(),
+        new GUI(),
+        null,
+        null,
+        null,
+        new InterpreterOutput(this));
+  }
+
+  @Override
+  public void onAppend(InterpreterOutput out, byte[] line) {
+
+  }
+
+  @Override
+  public void onUpdate(InterpreterOutput out, byte[] output) {
+
+  }
+}

python/src/test/java/org/apache/zeppelin/python/PythonInterpreterTest.java

@@ -95,21 +95,6 @@ public class PythonInterpreterTest {
     group.get("note").add(pythonInterpreter);
     pythonInterpreter.setInterpreterGroup(group);
 
-    /*
-    // python conda interpreter
-    ClassloaderInterpreter conda = new ClassloaderInterpreter(
-        new PythonCondaInterpreter(new Properties()),
-        Thread.currentThread().getContextClassLoader());
-
-    // create interpreter group
-    InterpreterGroup group = new InterpreterGroup();
-    group.put("note", new LinkedList<Interpreter>());
-    group.get("note").add(pythonInterpreter);
-    group.get("note").add(conda);
-    pythonInterpreter.setInterpreterGroup(group);
-    conda.setInterpreterGroup(group);
-    */
-
     when(pythonInterpreter.getPythonProcess()).thenReturn(mockPythonProcess);
     when(mockPythonProcess.sendAndGetResult(eq("\n\nimport py4j\n"))).thenReturn("ImportError");
   }

zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java

@@ -533,6 +533,7 @@ public class ZeppelinConfiguration extends XMLConfiguration {
         + "org.apache.zeppelin.flink.FlinkInterpreter,"
         + "org.apache.zeppelin.python.PythonInterpreter,"
         + "org.apache.zeppelin.python.PythonInterpreterPandasSql,"
+        + "org.apache.zeppelin.python.PythonCondaInterpreter,"
         + "org.apache.zeppelin.ignite.IgniteInterpreter,"
         + "org.apache.zeppelin.ignite.IgniteSqlInterpreter,"
         + "org.apache.zeppelin.lens.LensInterpreter,"