Cleaned up commented lines

This commit is contained in:
Jongyoul Lee 2016-10-05 23:40:19 +09:00
parent 1237658269
commit 15a371165e
2 changed files with 1 additions and 12 deletions

View file

@ -91,7 +91,6 @@ before_script:
- travis_retry ./testing/downloadSpark.sh $SPARK_VER $HADOOP_VER
- echo "export SPARK_HOME=`pwd`/spark-$SPARK_VER-bin-hadoop$HADOOP_VER" > conf/zeppelin-env.sh
- tail conf/zeppelin-env.sh
#- ./testing/startSparkCluster.sh $SPARK_VER $HADOOP_VER
script:
- mvn $TEST_FLAG $PROFILE -B $TEST_PROJECTS
@ -109,6 +108,3 @@ after_failure:
- cat zeppelin-web/npm-debug.log
- cat spark-*/logs/*
after_script:
#- ./testing/stopSparkCluster.sh $SPARK_VER $HADOOP_VER

View file

@ -238,14 +238,7 @@ public abstract class AbstractTestRestApi {
}
private static boolean isActiveSparkHome(File dir) {
if (dir.getName().matches("spark-[0-9\\.]+[A-Za-z-]*-bin-hadoop[0-9\\.]+")) {
/*File pidDir = new File(dir, "run");
if (pidDir.isDirectory() && pidDir.listFiles().length > 0) {
return true;
}*/
return true;
}
return false;
return dir.getName().matches("spark-[0-9\\.]+[A-Za-z-]*-bin-hadoop[0-9\\.]+");
}
protected static void shutDown() throws Exception {