Update SPARK_HOME directory detection pattern for 2.0.0-preview in the test

Leemoonsoo · Leemoonsoo · commit 839912a6aba6 · 2016-07-23T02:53:40.000+09:00
diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java
@@ -223,7 +223,7 @@ private static String getSparkHomeRecursively(File dir) {
   }
 
   private static boolean isActiveSparkHome(File dir) {
-    if (dir.getName().matches("spark-[0-9\\.]+-bin-hadoop[0-9\\.]+")) {
+    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;

Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@ private static String getSparkHomeRecursively(File dir) {`
`223`	`223`	`}`
`224`	`224`
`225`	`225`	`private static boolean isActiveSparkHome(File dir) {`
`226`		`- if (dir.getName().matches("spark-[0-9\\.]+-bin-hadoop[0-9\\.]+")) {`
	`226`	`+ if (dir.getName().matches("spark-[0-9\\.]+[A-Za-z-]*-bin-hadoop[0-9\\.]+")) {`
`227`	`227`	`File pidDir = new File(dir, "run");`
`228`	`228`	`if (pidDir.isDirectory() && pidDir.listFiles().length > 0) {`
`229`	`229`	`return true;`