falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rag...@apache.org
Subject [1/2] incubator-falcon git commit: FALCON-890 Merlin tests need to be updated in secure cluster to get the token using the ugi object requests. Contributed by Arpit Gupta
Date Wed, 12 Nov 2014 23:37:34 GMT
Repository: incubator-falcon
Updated Branches:
  refs/heads/master 6f4f4b7bc -> b85573e22


http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b85573e2/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RetentionTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RetentionTest.java
b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RetentionTest.java
index a17e1ba..3d471f6 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RetentionTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RetentionTest.java
@@ -168,7 +168,8 @@ public class RetentionTest extends BaseTestClass {
      */
     private void commonDataRetentionWorkflow(String feed, FreqType freqType,
         RetentionUnit retentionUnit, int retentionPeriod) throws OozieClientException,
-        IOException, URISyntaxException, AuthenticationException, JMSException {
+            IOException, URISyntaxException, AuthenticationException, JMSException,
+            InterruptedException {
         //get Data created in the cluster
         List<String> initialData = Util.getHadoopDataFromDir(clusterFS, feed, testHDFSDir);
 

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b85573e2/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/UpdateAtSpecificTimeTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/UpdateAtSpecificTimeTest.java
b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/UpdateAtSpecificTimeTest.java
index 505df1c..a61b400 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/UpdateAtSpecificTimeTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/UpdateAtSpecificTimeTest.java
@@ -102,8 +102,8 @@ public class UpdateAtSpecificTimeTest extends BaseTestClass {
 
     @Test(groups = {"singleCluster", "0.3.1", "embedded"}, timeOut = 1200000, enabled = true)
     public void invalidChar_Process()
-        throws JAXBException, IOException, URISyntaxException,
-        AuthenticationException, OozieClientException {
+            throws JAXBException, IOException, URISyntaxException,
+            AuthenticationException, OozieClientException, InterruptedException {
         processBundle.setProcessValidity(TimeUtil.getTimeWrtSystemTime(0),
             TimeUtil.getTimeWrtSystemTime(20));
         processBundle.submitFeedsScheduleProcess(prism);
@@ -120,8 +120,8 @@ public class UpdateAtSpecificTimeTest extends BaseTestClass {
 
     @Test(groups = {"singleCluster", "0.3.1", "embedded"}, timeOut = 1200000, enabled = true)
     public void invalidChar_Feed()
-        throws JAXBException, IOException, URISyntaxException, AuthenticationException,
-        OozieClientException {
+            throws JAXBException, IOException, URISyntaxException, AuthenticationException,
+            OozieClientException, InterruptedException {
 
         String feed = submitAndScheduleFeed(processBundle);
         InstanceUtil.waitTillInstancesAreCreated(cluster1, feed, 0);
@@ -136,8 +136,8 @@ public class UpdateAtSpecificTimeTest extends BaseTestClass {
 
     @Test(groups = {"singleCluster", "0.3.1", "embedded"}, timeOut = 1200000, enabled = true)
     public void updateTimeInPast_Process()
-        throws JAXBException, IOException, URISyntaxException,
-        OozieClientException, AuthenticationException {
+            throws JAXBException, IOException, URISyntaxException,
+            OozieClientException, AuthenticationException, InterruptedException {
 
         processBundle.setProcessValidity(TimeUtil.getTimeWrtSystemTime(0),
                 TimeUtil.getTimeWrtSystemTime(20));
@@ -168,8 +168,8 @@ public class UpdateAtSpecificTimeTest extends BaseTestClass {
 
     @Test(groups = {"MultiCluster", "0.3.1", "embedded"}, timeOut = 1200000, enabled = true)
     public void updateTimeInPast_Feed()
-        throws JAXBException, IOException, OozieClientException,
-        URISyntaxException, AuthenticationException {
+            throws JAXBException, IOException, OozieClientException,
+            URISyntaxException, AuthenticationException, InterruptedException {
 
         String startTimeCluster_source = TimeUtil.getTimeWrtSystemTime(-10);
         String startTimeCluster_target = TimeUtil.getTimeWrtSystemTime(10);
@@ -208,8 +208,8 @@ public class UpdateAtSpecificTimeTest extends BaseTestClass {
 
     @Test(groups = {"MultiCluster", "0.3.1", "distributed"}, timeOut = 1200000, enabled =
true)
     public void inNextFewMinutesUpdate_RollForward_Process()
-        throws JAXBException, IOException, URISyntaxException, JSchException,
-        OozieClientException, SAXException, AuthenticationException {
+            throws JAXBException, IOException, URISyntaxException, JSchException,
+            OozieClientException, SAXException, AuthenticationException, InterruptedException
{
         /*
         submit process on 3 clusters. Schedule on 2 clusters. Bring down one of
         the scheduled cluster. Update with time 5 minutes from now. On running
@@ -308,8 +308,8 @@ public class UpdateAtSpecificTimeTest extends BaseTestClass {
 
     @Test(groups = {"MultiCluster", "0.3.1", "distributed"}, timeOut = 1200000, enabled =
true)
     public void inNextFewMinutesUpdate_RollForward_Feed()
-        throws JAXBException, IOException, URISyntaxException, JSchException, 
-        OozieClientException, SAXException, AuthenticationException {
+            throws JAXBException, IOException, URISyntaxException, JSchException,
+            OozieClientException, SAXException, AuthenticationException, InterruptedException
{
         try {
             String startTimeCluster_source = TimeUtil.getTimeWrtSystemTime(-18);
             String feed = getMultiClusterFeed(startTimeCluster_source, startTimeCluster_source);
@@ -421,8 +421,8 @@ public class UpdateAtSpecificTimeTest extends BaseTestClass {
 
     @Test(groups = {"multiCluster", "0.3.1", "embedded"}, timeOut = 1200000, enabled = true)
     public void updateTimeAfterEndTime_Feed()
-        throws JAXBException, IOException, OozieClientException,
-        URISyntaxException, AuthenticationException {
+            throws JAXBException, IOException, OozieClientException,
+            URISyntaxException, AuthenticationException, InterruptedException {
 
         /* submit and schedule feed with end time 60 mins in future and update with +60 in
future*/
         String startTime = TimeUtil.getTimeWrtSystemTime(-15);
@@ -463,7 +463,8 @@ public class UpdateAtSpecificTimeTest extends BaseTestClass {
 
     @Test(groups = {"multiCluster", "0.3.1", "embedded"}, timeOut = 1200000, enabled = true)
     public void updateTimeBeforeStartTime_Process() throws JAXBException, IOException,
-        URISyntaxException, OozieClientException, AuthenticationException {
+            URISyntaxException, OozieClientException, AuthenticationException,
+            InterruptedException {
 
         /* submit and schedule process with start time +10 mins from now. Update with start
time
         -4 and update time +2 mins */
@@ -492,8 +493,8 @@ public class UpdateAtSpecificTimeTest extends BaseTestClass {
 
     @Test(groups = {"MultiCluster", "0.3.1"}, timeOut = 1200000, enabled = true)
     public void updateDiffClusterDiffValidity_Process()
-        throws JAXBException, IOException, URISyntaxException, OozieClientException,
-        AuthenticationException {
+            throws JAXBException, IOException, URISyntaxException, OozieClientException,
+            AuthenticationException, InterruptedException {
 
         //set start end process time for 3 clusters
         String startTime_cluster1 = TimeUtil.getTimeWrtSystemTime(-40);
@@ -571,7 +572,8 @@ public class UpdateAtSpecificTimeTest extends BaseTestClass {
     }
 
     private String submitAndScheduleFeed(Bundle b)
-        throws JAXBException, IOException, URISyntaxException, AuthenticationException {
+            throws JAXBException, IOException, URISyntaxException, AuthenticationException,
+            InterruptedException {
         String feed = b.getDataSets().get(0);
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity("2012-10-01T12:00Z", "2010-01-01T00:00Z"),
@@ -592,7 +594,7 @@ public class UpdateAtSpecificTimeTest extends BaseTestClass {
 
     private String getMultiClusterFeed(String startTimeCluster_source,
                                        String startTimeCluster_target)
-        throws IOException, URISyntaxException, AuthenticationException {
+            throws IOException, URISyntaxException, AuthenticationException, InterruptedException
{
         String testDataDir = baseTestDir + "/replication";
 
         //create desired feed

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b85573e2/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/ClusterAclTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/ClusterAclTest.java
b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/ClusterAclTest.java
index 4bf5808..cc6da00 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/ClusterAclTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/ClusterAclTest.java
@@ -71,7 +71,6 @@ public class ClusterAclTest extends BaseTestClass {
         bundles[0].setProcessWorkflow(aggregateWorkflowDir);
         bundles[0].setCLusterACL(MerlinConstants.CURRENT_USER_NAME,
             MerlinConstants.CURRENT_USER_GROUP, "*");
-        KerberosHelper.loginFromKeytab(MerlinConstants.CURRENT_USER_NAME);
         clusterString = bundles[0].getClusters().get(0);
     }
 
@@ -141,7 +140,6 @@ public class ClusterAclTest extends BaseTestClass {
 
     @AfterMethod(alwaysRun = true)
     public void tearDown() {
-        KerberosHelper.loginFromKeytab(MerlinConstants.CURRENT_USER_NAME);
         removeBundles();
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b85573e2/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/EntityOp.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/EntityOp.java
b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/EntityOp.java
index 9674b84..5ea6266 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/EntityOp.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/EntityOp.java
@@ -46,16 +46,17 @@ enum EntityOp {
             try {
                 response = helper.getStatus(data, user);
             } catch (IOException e) {
-                logger.warn("Caught exception: " + e);
+                logger.error("Caught exception: " + e);
                 return false;
             } catch (URISyntaxException e) {
-                logger.warn("Caught exception: " + e);
+                logger.error("Caught exception: " + e);
                 return false;
             } catch (AuthenticationException e) {
-                logger.warn("Caught exception: " + e);
+                logger.error("Caught exception: " + e);
+                return false;
+            } catch (InterruptedException e) {
+                logger.error("Caught Exception: " + e);
                 return false;
-            } finally {
-                KerberosHelper.loginFromKeytab(MerlinConstants.CURRENT_USER_NAME);
             }
             return AssertUtil.checkSucceeded(response);
         }
@@ -67,16 +68,17 @@ enum EntityOp {
             try {
                 response = helper.getEntityDependencies(data, user);
             } catch (IOException e) {
-                logger.warn("Caught exception: " + e);
+                logger.error("Caught exception: " + e);
                 return false;
             } catch (URISyntaxException e) {
-                logger.warn("Caught exception: " + e);
+                logger.error("Caught exception: " + e);
                 return false;
             } catch (AuthenticationException e) {
-                logger.warn("Caught exception: " + e);
+                logger.error("Caught exception: " + e);
+                return false;
+            } catch (InterruptedException e) {
+                logger.error("Caught exception: " + e);
                 return false;
-            } finally {
-                KerberosHelper.loginFromKeytab(MerlinConstants.CURRENT_USER_NAME);
             }
             return AssertUtil.checkSucceeded(response);
         }
@@ -84,25 +86,25 @@ enum EntityOp {
     listing() {
         @Override
         public boolean executeAs(String user, IEntityManagerHelper helper, String data) {
-            KerberosHelper.loginFromKeytab(user);
             final String entityName = Util.readEntityName(data);
             final List<String> entities;
             try {
                 entities = CleanupUtil.getAllEntitiesOfOneType(helper, user);
             } catch (IOException e) {
-                logger.warn("Caught exception: " + e);
+                logger.error("Caught exception: " + e);
                 return false;
             } catch (URISyntaxException e) {
-                logger.warn("Caught exception: " + e);
+                logger.error("Caught exception: " + e);
                 return false;
             } catch (AuthenticationException e) {
-                logger.warn("Caught exception: " + e);
+                logger.error("Caught exception: " + e);
                 return false;
             } catch (JAXBException e) {
-                logger.warn("Caught exception: " + e);
+                logger.error("Caught exception: " + e);
+                return false;
+            } catch (InterruptedException e) {
+                logger.error("Caught exception: " + e);
                 return false;
-            } finally {
-                KerberosHelper.loginFromKeytab(MerlinConstants.CURRENT_USER_NAME);
             }
             logger.info("Checking for presence of " + entityName + " in " + entities);
             return entities.contains(entityName);
@@ -111,21 +113,21 @@ enum EntityOp {
     definition() {
         @Override
         public boolean executeAs(String user, IEntityManagerHelper helper, String data) {
-            KerberosHelper.loginFromKeytab(user);
             final ServiceResponse response;
             try {
                 response = helper.getEntityDefinition(data, user);
             } catch (IOException e) {
-                logger.warn("Caught exception: " + e);
+                logger.error("Caught exception: " + e);
                 return false;
             } catch (URISyntaxException e) {
-                logger.warn("Caught exception: " + e);
+                logger.error("Caught exception: " + e);
                 return false;
             } catch (AuthenticationException e) {
-                logger.warn("Caught exception: " + e);
+                logger.error("Caught exception: " + e);
+                return false;
+            } catch (InterruptedException e) {
+                logger.error("Caught exception: " + e);
                 return false;
-            } finally {
-                KerberosHelper.loginFromKeytab(MerlinConstants.CURRENT_USER_NAME);
             }
             return AssertUtil.checkSucceeded(response);
         }
@@ -133,21 +135,21 @@ enum EntityOp {
     delete() {
         @Override
         public boolean executeAs(String user, IEntityManagerHelper helper, String data) {
-            KerberosHelper.loginFromKeytab(user);
             final ServiceResponse response;
             try {
                 response = helper.delete(data, user);
             } catch (IOException e) {
-                logger.warn("Caught exception: " + e);
+                logger.error("Caught exception: " + e);
                 return false;
             } catch (URISyntaxException e) {
-                logger.warn("Caught exception: " + e);
+                logger.error("Caught exception: " + e);
                 return false;
             } catch (AuthenticationException e) {
-                logger.warn("Caught exception: " + e);
+                logger.error("Caught exception: " + e);
+                return false;
+            } catch (InterruptedException e) {
+                logger.error("Caught exception: " + e);
                 return false;
-            } finally {
-                KerberosHelper.loginFromKeytab(MerlinConstants.CURRENT_USER_NAME);
             }
             return AssertUtil.checkSucceeded(response);
         }
@@ -155,21 +157,21 @@ enum EntityOp {
     update() {
         @Override
         public boolean executeAs(String user, IEntityManagerHelper helper, String data) {
-            KerberosHelper.loginFromKeytab(user);
             final ServiceResponse response;
             try {
                 response = helper.update(data, data, user);
             } catch (IOException e) {
-                logger.warn("Caught exception: " + e);
+                logger.error("Caught exception: " + e);
                 return false;
             } catch (URISyntaxException e) {
-                logger.warn("Caught exception: " + e);
+                logger.error("Caught exception: " + e);
                 return false;
             } catch (AuthenticationException e) {
-                logger.warn("Caught exception: " + e);
+                logger.error("Caught exception: " + e);
+                return false;
+            } catch (InterruptedException e) {
+                logger.error("Caught exception: " + e);
                 return false;
-            } finally {
-                KerberosHelper.loginFromKeytab(MerlinConstants.CURRENT_USER_NAME);
             }
             return AssertUtil.checkSucceeded(response);
         }
@@ -177,21 +179,21 @@ enum EntityOp {
     schedule() {
         @Override
         public boolean executeAs(String user, IEntityManagerHelper helper, String data) {
-            KerberosHelper.loginFromKeytab(user);
             final ServiceResponse response;
             try {
                 response = helper.schedule(data, user);
             } catch (IOException e) {
-                logger.warn("Caught exception: " + e);
+                logger.error("Caught exception: " + e);
                 return false;
             } catch (URISyntaxException e) {
-                logger.warn("Caught exception: " + e);
+                logger.error("Caught exception: " + e);
                 return false;
             } catch (AuthenticationException e) {
-                logger.warn("Caught exception: " + e);
+                logger.error("Caught exception: " + e);
+                return false;
+            } catch (InterruptedException e) {
+                logger.error("Caught exception: " + e);
                 return false;
-            } finally {
-                KerberosHelper.loginFromKeytab(MerlinConstants.CURRENT_USER_NAME);
             }
             return AssertUtil.checkSucceeded(response);
         }
@@ -199,21 +201,21 @@ enum EntityOp {
     submit() {
         @Override
         public boolean executeAs(String user, IEntityManagerHelper helper, String data) {
-            KerberosHelper.loginFromKeytab(user);
             final ServiceResponse response;
             try {
                 response = helper.submitEntity(data, user);
             } catch (IOException e) {
-                logger.warn("Caught exception: " + e);
+                logger.error("Caught exception: " + e);
                 return false;
             } catch (URISyntaxException e) {
-                logger.warn("Caught exception: " + e);
+                logger.error("Caught exception: " + e);
                 return false;
             } catch (AuthenticationException e) {
-                logger.warn("Caught exception: " + e);
+                logger.error("Caught exception: " + e);
+                return false;
+            } catch (InterruptedException e) {
+                logger.error("Caught exception: " + e);
                 return false;
-            } finally {
-                KerberosHelper.loginFromKeytab(MerlinConstants.CURRENT_USER_NAME);
             }
             return AssertUtil.checkSucceeded(response);
         }
@@ -221,21 +223,21 @@ enum EntityOp {
     submitAndSchedule() {
         @Override
         public boolean executeAs(String user, IEntityManagerHelper helper, String data) {
-            KerberosHelper.loginFromKeytab(user);
             final ServiceResponse response;
             try {
                 response = helper.submitAndSchedule(data, user);
             } catch (IOException e) {
-                logger.warn("Caught exception: " + e);
+                logger.error("Caught exception: " + e);
                 return false;
             } catch (URISyntaxException e) {
-                logger.warn("Caught exception: " + e);
+                logger.error("Caught exception: " + e);
                 return false;
             } catch (AuthenticationException e) {
-                logger.warn("Caught exception: " + e);
+                logger.error("Caught exception: " + e);
+                return false;
+            } catch (InterruptedException e) {
+                logger.error("Caught exception: " + e);
                 return false;
-            } finally {
-                KerberosHelper.loginFromKeytab(MerlinConstants.CURRENT_USER_NAME);
             }
             return AssertUtil.checkSucceeded(response);
         }
@@ -243,21 +245,21 @@ enum EntityOp {
     suspend() {
         @Override
         public boolean executeAs(String user, IEntityManagerHelper helper, String data) {
-            KerberosHelper.loginFromKeytab(user);
             final ServiceResponse response;
             try {
                 response = helper.suspend(data, user);
             } catch (IOException e) {
-                logger.warn("Caught exception: " + e);
+                logger.error("Caught exception: " + e);
                 return false;
             } catch (URISyntaxException e) {
-                logger.warn("Caught exception: " + e);
+                logger.error("Caught exception: " + e);
                 return false;
             } catch (AuthenticationException e) {
-                logger.warn("Caught exception: " + e);
+                logger.error("Caught exception: " + e);
+                return false;
+            } catch (InterruptedException e) {
+                logger.error("Caught exception: " + e);
                 return false;
-            } finally {
-                KerberosHelper.loginFromKeytab(MerlinConstants.CURRENT_USER_NAME);
             }
             return AssertUtil.checkSucceeded(response);
         }
@@ -265,21 +267,21 @@ enum EntityOp {
     resume() {
         @Override
         public boolean executeAs(String user, IEntityManagerHelper helper, String data) {
-            KerberosHelper.loginFromKeytab(user);
             final ServiceResponse response;
             try {
                 response = helper.resume(data, user);
             } catch (IOException e) {
-                logger.warn("Caught exception: " + e);
+                logger.error("Caught exception: " + e);
                 return false;
             } catch (URISyntaxException e) {
-                logger.warn("Caught exception: " + e);
+                logger.error("Caught exception: " + e);
                 return false;
             } catch (AuthenticationException e) {
-                logger.warn("Caught exception: " + e);
+                logger.error("Caught exception: " + e);
+                return false;
+            } catch (InterruptedException e) {
+                logger.error("Caught exception: " + e);
                 return false;
-            } finally {
-                KerberosHelper.loginFromKeytab(MerlinConstants.CURRENT_USER_NAME);
             }
             return AssertUtil.checkSucceeded(response);
         }

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b85573e2/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/FalconClientTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/FalconClientTest.java
b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/FalconClientTest.java
index 13b0a13..a716e56 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/FalconClientTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/FalconClientTest.java
@@ -87,7 +87,6 @@ public class FalconClientTest extends BaseTestClass {
     public void badClusterDelete() throws Exception {
         bundles[0].submitClusters(prism);
         final String cluster = bundles[0].getClusters().get(0);
-        KerberosHelper.loginFromKeytab(MerlinConstants.DIFFERENT_USER_NAME);
         final ExecResult execResult =
                 prism.getClusterHelper().clientDelete(cluster, MerlinConstants.DIFFERENT_USER_NAME);
         AssertUtil.assertFailed(execResult, "cluster deletion failed");
@@ -95,7 +94,6 @@ public class FalconClientTest extends BaseTestClass {
 
     @AfterMethod(alwaysRun = true)
     public void tearDown() {
-        KerberosHelper.loginFromKeytab(MerlinConstants.CURRENT_USER_NAME);
         removeBundles();
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b85573e2/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/FeedAclTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/FeedAclTest.java
b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/FeedAclTest.java
index bcc1998..d536188 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/FeedAclTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/FeedAclTest.java
@@ -72,8 +72,6 @@ public class FeedAclTest extends BaseTestClass {
         bundles[0].setInputFeedACL(MerlinConstants.CURRENT_USER_NAME,
             MerlinConstants.CURRENT_USER_GROUP, "*");
         feedString = bundles[0].getInputFeedFromBundle();
-
-        KerberosHelper.loginFromKeytab(MerlinConstants.CURRENT_USER_NAME);
     }
 
     /**
@@ -221,7 +219,6 @@ public class FeedAclTest extends BaseTestClass {
                     + MerlinConstants.DIFFERENT_USER_GROUP + " was not able to perform: "
+ op);
         }
         //check that different user can access the feed
-        KerberosHelper.loginFromKeytab(MerlinConstants.DIFFERENT_USER_NAME);
         for(EntityOp op : new EntityOp[]{EntityOp.status, EntityOp.dependency, EntityOp.listing,
                 EntityOp.definition}) {
             final boolean executeRes =
@@ -236,7 +233,6 @@ public class FeedAclTest extends BaseTestClass {
 
     @AfterMethod(alwaysRun = true)
     public void tearDown() {
-        KerberosHelper.loginFromKeytab(MerlinConstants.CURRENT_USER_NAME);
         removeBundles();
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b85573e2/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/ProcessAclTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/ProcessAclTest.java
b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/ProcessAclTest.java
index 467d043..d40a4ea 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/ProcessAclTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/ProcessAclTest.java
@@ -79,8 +79,6 @@ public class ProcessAclTest extends BaseTestClass {
         final Date tenMinInFuture = new DateTime(DateTimeZone.UTC).plusMinutes(10).toDate();
         processMerlin.getClusters().getClusters().get(0).getValidity().setEnd(tenMinInFuture);
         processString = processMerlin.toString();
-
-        KerberosHelper.loginFromKeytab(MerlinConstants.CURRENT_USER_NAME);
     }
 
     /**
@@ -227,7 +225,6 @@ public class ProcessAclTest extends BaseTestClass {
                     + MerlinConstants.DIFFERENT_USER_GROUP + " was not able to perform: "
+ op);
         }
         //check that different user can access the feed
-        KerberosHelper.loginFromKeytab(MerlinConstants.DIFFERENT_USER_NAME);
         for(EntityOp op : new EntityOp[]{EntityOp.status, EntityOp.dependency, EntityOp.listing,
                 EntityOp.definition}) {
             final boolean executeRes =
@@ -242,7 +239,6 @@ public class ProcessAclTest extends BaseTestClass {
 
     @AfterMethod(alwaysRun = true)
     public void tearDown() {
-        KerberosHelper.loginFromKeytab(MerlinConstants.CURRENT_USER_NAME);
         removeBundles();
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b85573e2/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/LineageGraphTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/LineageGraphTest.java
b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/LineageGraphTest.java
index d7ac724..164caa5 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/LineageGraphTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/LineageGraphTest.java
@@ -78,8 +78,8 @@ public class LineageGraphTest extends BaseUITestClass {
      */
     @BeforeClass
     public void setUp()
-        throws IOException, JAXBException, URISyntaxException, AuthenticationException,
-        OozieClientException {
+            throws IOException, JAXBException, URISyntaxException, AuthenticationException,
+            OozieClientException, InterruptedException {
         uploadDirToClusters(aggregateWorkflowDir, OSUtil.RESOURCES_OOZIE);
         bundles[0] = BundleUtil.readELBundle();
         bundles[0] = new Bundle(bundles[0], cluster);

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b85573e2/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/ProcessUITest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/ProcessUITest.java
b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/ProcessUITest.java
index 76173b7..88c26d5 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/ProcessUITest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/ProcessUITest.java
@@ -77,8 +77,9 @@ public class ProcessUITest extends BaseUITestClass {
 
     @BeforeMethod
     public void setUp()
-        throws IOException, JAXBException, NoSuchMethodException, IllegalAccessException,
-        InvocationTargetException, URISyntaxException, AuthenticationException {
+            throws IOException, JAXBException, NoSuchMethodException, IllegalAccessException,
+            InvocationTargetException, URISyntaxException, AuthenticationException,
+            InterruptedException {
         CleanupUtil.cleanAllEntities(prism);
         uploadDirToClusters(aggregateWorkflowDir, OSUtil.RESOURCES_OOZIE);
         openBrowser();
@@ -169,8 +170,8 @@ public class ProcessUITest extends BaseUITestClass {
      */
     @Test
     public void testProcessUI()
-        throws URISyntaxException, IOException, AuthenticationException, JAXBException,
-        OozieClientException {
+            throws URISyntaxException, IOException, AuthenticationException, JAXBException,
+            OozieClientException, InterruptedException {
 
         //check Process statuses via UI
         EntitiesPage page = new EntitiesPage(DRIVER, cluster, EntityType.PROCESS);


Mime
View raw message