Repository: falcon Updated Branches: refs/heads/master 815e47695 -> 4c86021c5
FALCON-1388 Fix merge conflicts produced by FALCON-1002. Contributed by Paul Isaychuk Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/4c86021c Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/4c86021c Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/4c86021c Branch: refs/heads/master Commit: 4c86021c549f0bac53915dc016f6caa94163ba25 Parents: 815e476 Author: Paul Isaychuk <[email protected]> Authored: Tue Aug 11 13:18:21 2015 +0300 Committer: Paul Isaychuk <[email protected]> Committed: Tue Aug 11 13:18:21 2015 +0300 ---------------------------------------------------------------------- falcon-regression/CHANGES.txt | 2 ++ .../regression/prism/UpdateAtSpecificTimeTest.java | 14 +++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/4c86021c/falcon-regression/CHANGES.txt ---------------------------------------------------------------------- diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt index f382066..7ad0f3d 100644 --- a/falcon-regression/CHANGES.txt +++ b/falcon-regression/CHANGES.txt @@ -364,6 +364,8 @@ Trunk (Unreleased) FALCON-681 delete duplicate feed retention test from falcon regression (SamarthG) BUG FIXES + FALCON-1388 Fix merge conflicts produced by FALCON-1002 (Paul Isaychuk) + FALCON-1002 Disable UpdateAtSpecific time test from falcon regression(Samarth Gupta via Ajay Yadava) FALCON-1376 Fixing FeedDelayTest(Pragya Mittal via Ajay Yadava) http://git-wip-us.apache.org/repos/asf/falcon/blob/4c86021c/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 36f2786..c6861ca 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 @@ -100,7 +100,6 @@ public class UpdateAtSpecificTimeTest extends BaseTestClass { @AfterMethod(alwaysRun = false) public void tearDown() { removeTestClassEntities(); - removeBundles(processBundle); } @Test(groups = {"singleCluster", "0.3.1", "embedded"}, timeOut = 1200000, enabled = false) @@ -110,13 +109,13 @@ public class UpdateAtSpecificTimeTest extends BaseTestClass { processBundle.setProcessValidity(TimeUtil.getTimeWrtSystemTime(0), TimeUtil.getTimeWrtSystemTime(20)); processBundle.submitFeedsScheduleProcess(prism); - InstanceUtil.waitTillInstancesAreCreated(cluster1, processBundle.getProcessData(), 0); + InstanceUtil.waitTillInstancesAreCreated(cluster1OC, 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); + processBundle.getProcessData(), "abc"); Assert.assertTrue(r.getMessage() .contains("java.lang.IllegalArgumentException: abc is not a valid UTC string")); } @@ -126,13 +125,14 @@ public class UpdateAtSpecificTimeTest extends BaseTestClass { throws JAXBException, IOException, URISyntaxException, AuthenticationException, OozieClientException, InterruptedException { - String feed = submitAndScheduleFeed(processBundle); - InstanceUtil.waitTillInstancesAreCreated(cluster1, feed, 0); + FeedMerlin feed = new FeedMerlin(submitAndScheduleFeed(processBundle)); + InstanceUtil.waitTillInstancesAreCreated(cluster1OC, feed.toString(), 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); + FeedMerlin updatedFeed = new FeedMerlin(feed.toString()); + updatedFeed.setFrequency(f); + ServiceResponse r = prism.getFeedHelper().update(feed.toString(), updatedFeed.toString(), "abc"); Assert.assertTrue(r.getMessage() .contains("java.lang.IllegalArgumentException: abc is not a valid UTC string")); }
