Repository: incubator-falcon Updated Branches: refs/heads/master 952de6517 -> c682b34df
FALCON-956 Fix testProcessInstanceStatusTimedOut. Contributed by Paul Isaychuk Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/c682b34d Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/c682b34d Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/c682b34d Branch: refs/heads/master Commit: c682b34dff6562580bcec5ab766a21acc5b1af10 Parents: 952de65 Author: Raghav Kumar Gautam <rag...@apache.org> Authored: Thu Dec 18 14:49:58 2014 -0800 Committer: Raghav Kumar Gautam <rag...@apache.org> Committed: Thu Dec 18 14:49:58 2014 -0800 ---------------------------------------------------------------------- falcon-regression/CHANGES.txt | 2 ++ .../org/apache/falcon/regression/ProcessInstanceStatusTest.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/c682b34d/falcon-regression/CHANGES.txt ---------------------------------------------------------------------- diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt index 7afceef..b299b40 100644 --- a/falcon-regression/CHANGES.txt +++ b/falcon-regression/CHANGES.txt @@ -184,6 +184,8 @@ Trunk (Unreleased) FALCON-681 delete duplicate feed retention test from falcon regression (SamarthG) BUG FIXES + FALCON-956 Fix testProcessInstanceStatusTimedOut (Paul Isaychuk via Raghav Kumar Gautam) + FALCON-937 Fix tests that are still using hdfs root dir in feeds (Raghav Kumar Gautam via Ruslan Ostafiychuk) http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/c682b34d/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceStatusTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceStatusTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceStatusTest.java index 91fbf29..4bdda8a 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceStatusTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceStatusTest.java @@ -377,7 +377,7 @@ public class ProcessInstanceStatusTest extends BaseTestClass { bundles[0].setOutputFeedLocationData(feedOutputTimedOutPath); bundles[0].setProcessConcurrency(3); bundles[0].submitFeedsScheduleProcess(prism); - InstanceUtil.waitTillInstanceReachState(clusterOC, processName, 1, Status.TIMEDOUT, + InstanceUtil.waitTillInstanceReachState(clusterOC, processName, 3, Status.TIMEDOUT, EntityType.PROCESS); InstancesResult r = prism.getProcessHelper().getProcessInstanceStatus(processName, "?start=2010-01-02T01:00Z&end=2010-01-02T01:11Z");
