add unit test

This commit is contained in:
Jeff Zhang 2016-09-09 14:21:37 +08:00
parent 296c63fdf4
commit 4fe033d3e7
2 changed files with 26 additions and 1 deletions

View file

@ -171,7 +171,12 @@ public abstract class AbstractTestRestApi {
String sparkHome = getSparkHome();
if (sparkHome != null) {
sparkIntpSetting.getProperties().setProperty("master", "spark://" + getHostname() + ":7071");
if (System.getenv("SPARK_MASTER") != null) {
sparkIntpSetting.getProperties().setProperty("master", System.getenv("SPARK_MASTER"));
} else {
sparkIntpSetting.getProperties()
.setProperty("master", "spark://" + getHostname() + ":7071");
}
sparkIntpSetting.getProperties().setProperty("spark.cores.max", "2");
// set spark home for pyspark
sparkIntpSetting.getProperties().setProperty("spark.home", sparkHome);

View file

@ -140,6 +140,26 @@ public class ZeppelinSparkClusterTest extends AbstractTestRestApi {
waitForFinish(p);
assertEquals(Status.FINISHED, p.getStatus());
assertEquals("55\n", p.getResult().message());
// run sqlContext test
p.setText("%pyspark from pyspark.sql import Row\n" +
"df=sqlContext.createDataFrame([Row(name='Alice', age=20)])\n" +
"df.count()");
note.run(p.getId());
waitForFinish(p);
assertEquals(Status.FINISHED, p.getStatus());
assertEquals("1\n", p.getResult().message());
if (sparkVersion >= 20) {
// run SparkSession test
p.setText("%pyspark from pyspark.sql import Row\n" +
"df=sqlContext.createDataFrame([Row(name='Alice', age=20)])\n" +
"df.count()");
note.run(p.getId());
waitForFinish(p);
assertEquals(Status.FINISHED, p.getStatus());
assertEquals("1\n", p.getResult().message());
}
}
ZeppelinServer.notebook.removeNote(note.getId(), null);
}