From 70915a2069d226a6f5d4337cf2482e2e9bb0e8e2 Mon Sep 17 00:00:00 2001
From: Lee moon soo <moon@apache.org>
Date: Mon, 15 May 2017 07:28:39 -0700
Subject: [PATCH 1/2] use last JSESSIONID

---
 .../org/apache/zeppelin/rest/AbstractTestRestApi.java  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

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
index 7ea2774c9d7..00b82fdd6fa 100644
--- a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java
+++ b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java
@@ -429,13 +429,19 @@ private static String getCookie(String user, String password) throws IOException
     LOG.info("{} - {}", postMethod.getStatusCode(), postMethod.getStatusText());
     Pattern pattern = Pattern.compile("JSESSIONID=([a-zA-Z0-9-]*)");
     Header[] setCookieHeaders = postMethod.getResponseHeaders("Set-Cookie");
+    String jsessionId = null;
     for (Header setCookie : setCookieHeaders) {
       java.util.regex.Matcher matcher = pattern.matcher(setCookie.toString());
       if (matcher.find()) {
-        return matcher.group(1);
+        jsessionId = matcher.group(1);
       }
     }
-    return StringUtils.EMPTY;
+
+    if (jsessionId != null) {
+      return jsessionId;
+    } else {
+      return StringUtils.EMPTY;
+    }
   }
 
   protected static boolean userAndPasswordAreNotBlank(String user, String pwd) {

From ed43ce93d8b9bba16fd213d5a38adda773b2f1e1 Mon Sep 17 00:00:00 2001
From: Lee moon soo <moon@apache.org>
Date: Wed, 17 May 2017 15:19:40 -0400
Subject: [PATCH 2/2] enable SecurityRestApiTest, NotebookSecurityRestApiTest

---
 .travis.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1a384688e87..d6887ef8762 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -52,11 +52,9 @@ matrix:
     # HeliumApplicationFactoryTest - https://issues.apache.org/jira/browse/ZEPPELIN-2470
     # NotebookTest                 - https://issues.apache.org/jira/browse/ZEPPELIN-2471
     # ZeppelinRestApiTest          - https://issues.apache.org/jira/browse/ZEPPELIN-2473
-    # SecurityRestApiTest          - https://issues.apache.org/jira/browse/ZEPPELIN-2545
-    # NotebookSecurityRestApiTest  - https://issues.apache.org/jira/browse/ZEPPELIN-2546
     # After issues are fixed these tests need to be included back by removing them from the "-Dtests.to.exclude" property
     - jdk: "oraclejdk7"
-      env: SCALA_VER="2.11" SPARK_VER="2.1.0" HADOOP_VER="2.6" PROFILE="-Pweb-ci -Pscalding -Phelium-dev -Pexamples -Pscala-2.11" BUILD_FLAG="package -Pbuild-distr -DskipRat" TEST_FLAG="verify -Pusing-packaged-distr -DskipRat" MODULES="-pl ${INTERPRETERS}" TEST_PROJECTS="-Dtests.to.exclude=**/ZeppelinSparkClusterTest.java,**/org.apache.zeppelin.spark.*,**/HeliumBundleFactoryTest.java,**/HeliumApplicationFactoryTest.java,**/NotebookTest.java,**/ZeppelinRestApiTest.java,**/SecurityRestApiTest.java,**/NotebookSecurityRestApiTest.java -DfailIfNoTests=false"
+      env: SCALA_VER="2.11" SPARK_VER="2.1.0" HADOOP_VER="2.6" PROFILE="-Pweb-ci -Pscalding -Phelium-dev -Pexamples -Pscala-2.11" BUILD_FLAG="package -Pbuild-distr -DskipRat" TEST_FLAG="verify -Pusing-packaged-distr -DskipRat" MODULES="-pl ${INTERPRETERS}" TEST_PROJECTS="-Dtests.to.exclude=**/ZeppelinSparkClusterTest.java,**/org.apache.zeppelin.spark.*,**/HeliumBundleFactoryTest.java,**/HeliumApplicationFactoryTest.java,**/NotebookTest.java,**/ZeppelinRestApiTest.java -DfailIfNoTests=false"
 
     # Test selenium with spark module for 1.6.3
     - jdk: "oraclejdk7"