Repository: incubator-falcon Updated Branches: refs/heads/master 15b89bc31 -> 85ad94050
FALCON-801 Increasing time to wait for instance. 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/85ad9405 Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/85ad9405 Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/85ad9405 Branch: refs/heads/master Commit: 85ad940500947894ac25e35e98578b92e4a487f0 Parents: 15b89bc Author: Raghav Kumar Gautam <rag...@apache.org> Authored: Thu Oct 16 17:37:16 2014 -0700 Committer: Raghav Kumar Gautam <rag...@apache.org> Committed: Thu Oct 16 17:37:16 2014 -0700 ---------------------------------------------------------------------- falcon-regression/CHANGES.txt | 2 ++ .../java/org/apache/falcon/regression/prism/OptionalInputTest.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/85ad9405/falcon-regression/CHANGES.txt ---------------------------------------------------------------------- diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt index 96d3d37..15554ab 100644 --- a/falcon-regression/CHANGES.txt +++ b/falcon-regression/CHANGES.txt @@ -14,6 +14,8 @@ Trunk (Unreleased) via Samarth Gupta) IMPROVEMENTS + FALCON-801 Increasing time to wait for instance (Paul Isaychuk) + FALCON-809 Add message from response if assertSucceeded fails (Ruslan Ostafiychuk) FALCON-802 Authorization test disabled (Paul Isaychuk) http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/85ad9405/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/OptionalInputTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/OptionalInputTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/OptionalInputTest.java index c8a4754..5c04e20 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/OptionalInputTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/OptionalInputTest.java @@ -278,7 +278,7 @@ public class OptionalInputTest extends BaseTestClass { //from now on ... it should wait of input0 also InstanceUtil.waitTillInstancesAreCreated(cluster, process, 0); InstanceUtil.waitTillInstanceReachState(oozieClient, processName, - 2, CoordinatorAction.Status.WAITING, EntityType.PROCESS); + 2, CoordinatorAction.Status.WAITING, EntityType.PROCESS, 10); HadoopUtil.flattenAndPutDataInFolder(clusterFS, OSUtil.SINGLE_FILE, inputPath + "/input0/", dataDates); InstanceUtil.waitTillInstanceReachState(oozieClient, processName,
