Repository: falcon Updated Branches: refs/heads/master 57195fa05 -> cd0a95a48
FALCON-1376 Fixing FeedDelayTest. Contributed by Pragya Mittal. Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/cd0a95a4 Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/cd0a95a4 Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/cd0a95a4 Branch: refs/heads/master Commit: cd0a95a48bdee3cdf1e27b1de709ea83ab5d7487 Parents: 57195fa Author: Ajay Yadava <[email protected]> Authored: Fri Aug 7 16:48:44 2015 +0530 Committer: Ajay Yadava <[email protected]> Committed: Fri Aug 7 16:48:44 2015 +0530 ---------------------------------------------------------------------- falcon-regression/CHANGES.txt | 2 ++ .../java/org/apache/falcon/regression/prism/FeedDelayTest.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/cd0a95a4/falcon-regression/CHANGES.txt ---------------------------------------------------------------------- diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt index 1a300d5..676544a 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-1376 Fixing FeedDelayTest(Pragya Mittal via Ajay Yadava) + FALCON-1332 Fortify ClusterSetupTest#testRegistryInterface - if checkbox wasn't clicked repeat an attempt (Paul Isaychuk via Raghav Kumar Gautam) http://git-wip-us.apache.org/repos/asf/falcon/blob/cd0a95a4/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/FeedDelayTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/FeedDelayTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/FeedDelayTest.java index c000561..689b9e3 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/FeedDelayTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/FeedDelayTest.java @@ -191,7 +191,7 @@ public class FeedDelayTest extends BaseTestClass { //Adding data to empty folders for (String location : missingDependencies) { LOGGER.info("Transferring data to : " + location); - HadoopUtil.copyDataToFolder(sourceFS, location, OSUtil.concat(OSUtil.RESOURCES, "dataFile.xml")); + HadoopUtil.copyDataToFolder(sourceFS, location, OSUtil.concat(OSUtil.NORMAL_INPUT, "dataFile.xml")); } return missingDependencies; }
