Return-Path: X-Original-To: apmail-falcon-commits-archive@minotaur.apache.org Delivered-To: apmail-falcon-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 88BAE1868A for ; Mon, 10 Aug 2015 12:33:01 +0000 (UTC) Received: (qmail 72404 invoked by uid 500); 10 Aug 2015 12:32:48 -0000 Delivered-To: apmail-falcon-commits-archive@falcon.apache.org Received: (qmail 72364 invoked by uid 500); 10 Aug 2015 12:32:48 -0000 Mailing-List: contact commits-help@falcon.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@falcon.apache.org Delivered-To: mailing list commits@falcon.apache.org Received: (qmail 72355 invoked by uid 99); 10 Aug 2015 12:32:48 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Aug 2015 12:32:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 34F87DFDB1; Mon, 10 Aug 2015 12:32:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ajayyadava@apache.org To: commits@falcon.apache.org Message-Id: <3430e346aff44fe3ba8bb6f50d41897c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: falcon git commit: FALCON-1002 Disable UpdateAtSpecific time test from falcon regression. Contributed by Samarth Gupta. Date: Mon, 10 Aug 2015 12:32:48 +0000 (UTC) Repository: falcon Updated Branches: refs/heads/master 459b0dd79 -> 73e6e6b0d FALCON-1002 Disable UpdateAtSpecific time test from falcon regression. Contributed by Samarth Gupta. Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/73e6e6b0 Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/73e6e6b0 Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/73e6e6b0 Branch: refs/heads/master Commit: 73e6e6b0df298bcc8b07226c3789a5414b0331be Parents: 459b0dd Author: Ajay Yadava Authored: Mon Aug 10 15:33:09 2015 +0530 Committer: Ajay Yadava Committed: Mon Aug 10 15:33:09 2015 +0530 ---------------------------------------------------------------------- falcon-regression/CHANGES.txt | 2 + .../prism/UpdateAtSpecificTimeTest.java | 57 ++++++++++++++++---- 2 files changed, 48 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/73e6e6b0/falcon-regression/CHANGES.txt ---------------------------------------------------------------------- diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt index 676544a..d6fa935 100644 --- a/falcon-regression/CHANGES.txt +++ b/falcon-regression/CHANGES.txt @@ -362,6 +362,8 @@ Trunk (Unreleased) FALCON-681 delete duplicate feed retention test from falcon regression (SamarthG) BUG FIXES + FALCON-1002 Disable UpdateAtSpecific time test from falcon regression(Samarth Gupta via Ajay Yadava) + FALCON-1376 Fixing FeedDelayTest(Pragya Mittal via Ajay Yadava) FALCON-1332 Fortify ClusterSetupTest#testRegistryInterface - if checkbox wasn't clicked repeat an attempt http://git-wip-us.apache.org/repos/asf/falcon/blob/73e6e6b0/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 afa01c1..36f2786 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 @@ -76,12 +76,12 @@ public class UpdateAtSpecificTimeTest extends BaseTestClass { private final String baseTestDir = cleanAndGetTestDir(); private String aggregateWorkflowDir = baseTestDir + "/aggregator"; - @BeforeClass(alwaysRun = true) + @BeforeClass(alwaysRun = false) public void uploadWorkflow() throws Exception { uploadDirToClusters(aggregateWorkflowDir, OSUtil.RESOURCES_OOZIE); } - @BeforeMethod(alwaysRun = true) + @BeforeMethod(alwaysRun = false) public void setup() throws IOException { final Bundle bundle = BundleUtil.readFeedReplicationBundle(); bundles[0] = new Bundle(bundle, cluster1); @@ -97,12 +97,47 @@ public class UpdateAtSpecificTimeTest extends BaseTestClass { processBundle.setProcessWorkflow(aggregateWorkflowDir); } - @AfterMethod(alwaysRun = true) + @AfterMethod(alwaysRun = false) public void tearDown() { removeTestClassEntities(); + removeBundles(processBundle); } - @Test(groups = {"singleCluster", "0.3.1", "embedded"}, timeOut = 1200000, enabled = true) + @Test(groups = {"singleCluster", "0.3.1", "embedded"}, timeOut = 1200000, enabled = false) + public void invalidCharProcess() + throws JAXBException, IOException, URISyntaxException, + AuthenticationException, OozieClientException, InterruptedException { + processBundle.setProcessValidity(TimeUtil.getTimeWrtSystemTime(0), + TimeUtil.getTimeWrtSystemTime(20)); + processBundle.submitFeedsScheduleProcess(prism); + InstanceUtil.waitTillInstancesAreCreated(cluster1, processBundle.getProcessData(), 0); + String oldProcess = + processBundle.getProcessData(); + processBundle.setProcessValidity(TimeUtil.getTimeWrtSystemTime(5), + TimeUtil.getTimeWrtSystemTime(100)); + ServiceResponse r = prism.getProcessHelper().update(oldProcess, + processBundle.getProcessData(), "abc", null); + Assert.assertTrue(r.getMessage() + .contains("java.lang.IllegalArgumentException: abc is not a valid UTC string")); + } + + @Test(groups = {"singleCluster", "0.3.1", "embedded"}, timeOut = 1200000, enabled = false) + public void invalidCharFeed() + throws JAXBException, IOException, URISyntaxException, AuthenticationException, + OozieClientException, InterruptedException { + + String feed = submitAndScheduleFeed(processBundle); + InstanceUtil.waitTillInstancesAreCreated(cluster1, feed, 0); + + //update frequency + Frequency f = new Frequency("" + 21, Frequency.TimeUnit.minutes); + String updatedFeed = InstanceUtil.setFeedFrequency(feed, f); + ServiceResponse r = prism.getFeedHelper().update(feed, updatedFeed, "abc", null); + Assert.assertTrue(r.getMessage() + .contains("java.lang.IllegalArgumentException: abc is not a valid UTC string")); + } + + @Test(groups = {"singleCluster", "0.3.1", "embedded"}, timeOut = 1200000, enabled = false) public void updateTimeInPastProcess() throws JAXBException, IOException, URISyntaxException, OozieClientException, AuthenticationException, InterruptedException { @@ -133,7 +168,7 @@ public class UpdateAtSpecificTimeTest extends BaseTestClass { processBundle.getProcessData(), true, true); } - @Test(groups = {"MultiCluster", "0.3.1", "embedded"}, timeOut = 1200000, enabled = true) + @Test(groups = {"MultiCluster", "0.3.1", "embedded"}, timeOut = 1200000, enabled = false) public void updateTimeInPastFeed() throws JAXBException, IOException, OozieClientException, URISyntaxException, AuthenticationException, InterruptedException { @@ -163,7 +198,7 @@ public class UpdateAtSpecificTimeTest extends BaseTestClass { Assert.assertEquals(OozieUtil.checkIfFeedCoordExist(cluster3OC, updatedFeed.getName(), "RETENTION"), 2); } - @Test(groups = {"MultiCluster", "0.3.1", "distributed"}, timeOut = 1200000, enabled = true) + @Test(groups = {"MultiCluster", "0.3.1", "distributed"}, timeOut = 1200000, enabled = false) public void inNextFewMinutesUpdateRollForwardProcess() throws JAXBException, IOException, URISyntaxException, JSchException, OozieClientException, SAXException, AuthenticationException, InterruptedException { @@ -259,7 +294,7 @@ public class UpdateAtSpecificTimeTest extends BaseTestClass { } } - @Test(groups = {"MultiCluster", "0.3.1", "distributed"}, timeOut = 1200000, enabled = true) + @Test(groups = {"MultiCluster", "0.3.1", "distributed"}, timeOut = 1200000, enabled = false) public void inNextFewMinutesUpdateRollForwardFeed() throws JAXBException, IOException, URISyntaxException, JSchException, OozieClientException, SAXException, AuthenticationException, InterruptedException { @@ -328,7 +363,7 @@ public class UpdateAtSpecificTimeTest extends BaseTestClass { } } - @Test(groups = {"multiCluster", "0.3.1", "embedded"}, timeOut = 1200000, enabled = true) + @Test(groups = {"multiCluster", "0.3.1", "embedded"}, timeOut = 1200000, enabled = false) public void updateTimeAfterEndTimeProcess() throws JAXBException, InterruptedException, IOException, URISyntaxException, OozieClientException, AuthenticationException { @@ -367,7 +402,7 @@ public class UpdateAtSpecificTimeTest extends BaseTestClass { oldProcess, true, true); } - @Test(groups = {"multiCluster", "0.3.1", "embedded"}, timeOut = 1200000, enabled = true) + @Test(groups = {"multiCluster", "0.3.1", "embedded"}, timeOut = 1200000, enabled = false) public void updateTimeAfterEndTimeFeed() throws JAXBException, IOException, OozieClientException, URISyntaxException, AuthenticationException, InterruptedException { @@ -409,7 +444,7 @@ public class UpdateAtSpecificTimeTest extends BaseTestClass { OozieUtil.verifyNewBundleCreation(cluster1OC, oldBundleID, null, feed, true, false); } - @Test(groups = {"multiCluster", "0.3.1", "embedded"}, timeOut = 1200000, enabled = true) + @Test(groups = {"multiCluster", "0.3.1", "embedded"}, timeOut = 1200000, enabled = false) public void updateTimeBeforeStartTimeProcess() throws JAXBException, IOException, URISyntaxException, OozieClientException, AuthenticationException, InterruptedException { @@ -437,7 +472,7 @@ public class UpdateAtSpecificTimeTest extends BaseTestClass { oldProcess, true, false); } - @Test(groups = {"MultiCluster", "0.3.1"}, timeOut = 1200000, enabled = true) + @Test(groups = {"MultiCluster", "0.3.1"}, timeOut = 1200000, enabled = false) public void updateDiffClusterDiffValidityProcess() throws JAXBException, IOException, URISyntaxException, OozieClientException, AuthenticationException, InterruptedException {