Repository: falcon Updated Branches: refs/heads/master 7eb362a5e -> 6a5d1f3db
FALCON-1846 Fixing EntityDryRunTest FALCON-1846 Fixing ProcessInstanceStatusTest,ProcessInstanceResumeTest,EntityDryRunTest Author: Pragya <[email protected]> Reviewers: Murali Ramasami <[email protected]>" Closes #63 from pragya-mittal/testFix-1846 Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/6a5d1f3d Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/6a5d1f3d Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/6a5d1f3d Branch: refs/heads/master Commit: 6a5d1f3db7a2f42d4c1b17741bed4f03e00406ac Parents: 7eb362a Author: Pragya <[email protected]> Authored: Fri Mar 11 15:33:35 2016 +0530 Committer: Pragya Mittal <[email protected]> Committed: Fri Mar 11 15:33:35 2016 +0530 ---------------------------------------------------------------------- .../org/apache/falcon/regression/core/util/InstanceUtil.java | 2 +- .../org/apache/falcon/regression/prism/EntityDryRunTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/6a5d1f3d/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/InstanceUtil.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/InstanceUtil.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/InstanceUtil.java index c319183..d783b84 100644 --- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/InstanceUtil.java +++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/InstanceUtil.java @@ -516,7 +516,7 @@ public final class InstanceUtil { private static String getReplicatedFolderFromInstanceRunConf(String runConf) { String inputPathExample = getReplicationFolderFromInstanceRunConf(runConf).get(0); String postFix = inputPathExample.substring(inputPathExample.length() - 7, inputPathExample.length()); - return getReplicatedFolderBaseFromInstanceRunConf(runConf) + postFix; + return getReplicatedFolderBaseFromInstanceRunConf(runConf) + "/" + postFix; } public static String getOutputFolderBaseForInstanceForReplication( http://git-wip-us.apache.org/repos/asf/falcon/blob/6a5d1f3d/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 36cf704..f2d1037 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 @@ -89,7 +89,7 @@ public class EntityDryRunTest extends BaseTestClass { bundles[0].submitProcess(true); ServiceResponse response = prism.getProcessHelper().schedule(bundles[0].getProcessData()); validate(response, - "Entity schedule failed for process: " + bundles[0].getProcessName()); + "E1004: Expression language evaluation error, Unable to evaluate :${coord:someEL(1)"); } /** @@ -120,7 +120,7 @@ public class EntityDryRunTest extends BaseTestClass { bundles[0].submitClusters(prism); ServiceResponse response = prism.getFeedHelper().submitAndSchedule(feed.toString()); validate(response, - "Entity schedule failed for feed: " + bundles[0].getInputFeedNameFromBundle()); + "E1004: Expression language evaluation error, Unable to evaluate :${coord:someEL(1)"); } /**
