Repository: falcon Updated Branches: refs/heads/master 1a6b97d76 -> e7f1ee393
FALCON-976 EntityDryRunTest failing in falcon trunk contributed by Pragya M Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/e7f1ee39 Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/e7f1ee39 Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/e7f1ee39 Branch: refs/heads/master Commit: e7f1ee3938bb742b5c0aa272c963095d423080d2 Parents: 1a6b97d Author: Samarth Gupta <samarth.gu...@inmobi.com> Authored: Wed Dec 31 11:21:32 2014 +0530 Committer: Samarth Gupta <samarth.gu...@inmobi.com> Committed: Wed Dec 31 11:21:32 2014 +0530 ---------------------------------------------------------------------- falcon-regression/CHANGES.txt | 2 ++ .../falcon/regression/prism/EntityDryRunTest.java | 14 ++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/e7f1ee39/falcon-regression/CHANGES.txt ---------------------------------------------------------------------- diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt index 050cbdb..ad2c13f 100644 --- a/falcon-regression/CHANGES.txt +++ b/falcon-regression/CHANGES.txt @@ -36,6 +36,8 @@ Trunk (Unreleased) via Samarth Gupta) IMPROVEMENTS + + FALCON-976 EntityDryRunTest failing in falcon trunk (Pragya M via Samarth Gupta) FALCON-942 Cleanup BaseTestClass and setUp/tearDown methods (Ruslan Ostafiychuk) FALCON-962 Fortify ListFeedInstancesTest (Paul Isaychuk via Ruslan Ostafiychuk) http://git-wip-us.apache.org/repos/asf/falcon/blob/e7f1ee39/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/EntityDryRunTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/EntityDryRunTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/EntityDryRunTest.java index e1d6658..e62edc5 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/EntityDryRunTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/EntityDryRunTest.java @@ -87,7 +87,7 @@ public class EntityDryRunTest extends BaseTestClass { bundles[0].setProcessProperty("EntityDryRunTestProp", "${coord:someEL(1)"); bundles[0].submitProcess(true); ServiceResponse response = prism.getProcessHelper().schedule(bundles[0].getProcessData()); - validate(response); + validate(response,"E1004: Expression language evaluation error, Unable to evaluate :${coord:someEL(1)"); } /** @@ -101,7 +101,7 @@ public class EntityDryRunTest extends BaseTestClass { bundles[0].setProcessProperty("EntityDryRunTestProp", "${coord:someEL(1)"); ServiceResponse response = prism.getProcessHelper().update(bundles[0].getProcessData(), bundles[0].getProcessData(), TimeUtil.getTimeWrtSystemTime(5), null); - validate(response); + validate(response,"The new entity (process) " + bundles[0].getProcessName() + " can't be scheduled"); Assert.assertEquals( OozieUtil.getNumberOfBundle(clusterOC, EntityType.PROCESS, bundles[0].getProcessName()), 1, "more than one bundle found after failed update request"); @@ -116,7 +116,7 @@ public class EntityDryRunTest extends BaseTestClass { feed = Util.setFeedProperty(feed, "EntityDryRunTestProp", "${coord:someEL(1)"); bundles[0].submitClusters(prism); ServiceResponse response = prism.getFeedHelper().submitAndSchedule(feed); - validate(response); + validate(response,"E1004: Expression language evaluation error, Unable to evaluate :${coord:someEL(1)"); } /** @@ -130,16 +130,14 @@ public class EntityDryRunTest extends BaseTestClass { AssertUtil.assertSucceeded(response); feed = Util.setFeedProperty(feed, "EntityDryRunTestProp", "${coord:someEL(1)"); response = prism.getFeedHelper().update(feed, feed); - validate(response); + validate(response,"The new entity (feed) " + bundles[0].getInputFeedNameFromBundle() + " can't be scheduled"); Assert.assertEquals( OozieUtil.getNumberOfBundle(clusterOC, EntityType.FEED, Util.readEntityName(feed)), 1, "more than one bundle found after failed update request"); } - private void validate(ServiceResponse response) throws JAXBException { + private void validate(ServiceResponse response,String message) throws JAXBException { AssertUtil.assertFailed(response); - Assert.assertTrue(response.getMessage().contains("org.apache.falcon.FalconException: " - + "AUTHENTICATION : E1004 : Expression language evaluation error, Unable to evaluate :" - + "${coord:someEL(1)"), "Correct response was not present in process / feed schedule"); + Assert.assertTrue(response.getMessage().contains(message), "Correct response was not present in process / feed schedule"); } }
