Repository: falcon Updated Branches: refs/heads/master f635f203a -> 685a561cd
FALCON-1856 Fix ProcessInstanceStatusTest Author: Pragya <[email protected]> Reviewers: Murali Ramasami <[email protected]> Closes #68 from pragya-mittal/ProcessInstanceStatusTest Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/685a561c Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/685a561c Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/685a561c Branch: refs/heads/master Commit: 685a561cd51e56aad9845ab8c41f13c33789c02c Parents: f635f20 Author: Pragya <[email protected]> Authored: Mon Apr 4 16:12:45 2016 +0530 Committer: Pragya Mittal <[email protected]> Committed: Mon Apr 4 16:12:45 2016 +0530 ---------------------------------------------------------------------- .../apache/falcon/regression/ProcessInstanceResumeTest.java | 2 +- .../apache/falcon/regression/ProcessInstanceStatusTest.java | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/685a561c/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceResumeTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceResumeTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceResumeTest.java index ebc06d6..38efbd7 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceResumeTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceResumeTest.java @@ -171,7 +171,7 @@ public class ProcessInstanceResumeTest extends BaseTestClass { prism.getProcessHelper().getProcessInstanceSuspend(processName, param); prism.getProcessHelper().getProcessInstanceResume(processName, param); InstancesResult r = prism.getProcessHelper().getProcessInstanceStatus(processName, param); - InstanceUtil.validateResponse(r, 6, 1, 0, 5, 0); + InstanceUtil.validateResponse(r, 6, 1, 0, 2, 0); } /** http://git-wip-us.apache.org/repos/asf/falcon/blob/685a561c/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 e20df64..72f9d22 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 @@ -124,7 +124,7 @@ public class ProcessInstanceStatusTest extends BaseTestClass { InstancesResult r = prism.getProcessHelper().getProcessInstanceStatus(processName, "?start=2010-01-02T01:00Z&end=2010-01-02T10:20Z"); InstanceUtil.validateSuccess(r, bundles[0], WorkflowStatus.RUNNING); - InstanceUtil.validateResponse(r, 6, 1, 0, 5, 0); + InstanceUtil.validateResponse(r, 6, 1, 0, 0, 0); List<String> instanceWfIDs = InstanceUtil.getWorkflowJobIds(r); Assert.assertTrue(matchWorkflows(instanceWfIDs, oozieWfIDs), "No job ids exposed in status message"); } @@ -186,7 +186,7 @@ public class ProcessInstanceStatusTest extends BaseTestClass { Status.RUNNING, EntityType.PROCESS); List<String> oozieWfIDs = OozieUtil.getWorkflow(clusterOC, bundleId); InstancesResult r = prism.getProcessHelper().getProcessInstanceStatus(processName, null); - InstanceUtil.validateResponse(r, 6, 5, 0, 1, 0); + InstanceUtil.validateResponse(r, 6, 5, 0, 0, 0); List<String> instanceWfIDs = InstanceUtil.getWorkflowJobIds(r); Assert.assertTrue(matchWorkflows(instanceWfIDs, oozieWfIDs), "No job ids exposed in status message"); } @@ -315,7 +315,7 @@ public class ProcessInstanceStatusTest extends BaseTestClass { List<String> oozieWfIDs = OozieUtil.getWorkflow(clusterOC, bundleId); InstancesResult r = prism.getProcessHelper().getProcessInstanceStatus(processName, "?start=2010-01-02T00:00Z&end=2010-01-02T01:30Z"); - InstanceUtil.validateResponse(r, 5, 2, 0, 3, 0); + InstanceUtil.validateResponse(r, 5, 2, 0, 0, 0); List<String> instanceWfIDs = InstanceUtil.getWorkflowJobIds(r); Assert.assertTrue(matchWorkflows(instanceWfIDs, oozieWfIDs), "No job ids exposed in status message"); } @@ -342,7 +342,6 @@ public class ProcessInstanceStatusTest extends BaseTestClass { InstanceUtil.waitTillInstanceReachState(clusterOC, processName, 5, Status.SUSPENDED, EntityType.PROCESS, 3); TimeUtil.sleepSeconds(TIMEOUT); AssertUtil.assertSucceeded(prism.getProcessHelper().resume(process)); - TimeUtil.sleepSeconds(TIMEOUT); InstanceUtil.waitTillInstanceReachState(clusterOC, processName, 5, Status.RUNNING, EntityType.PROCESS, 5); AssertUtil.checkStatus(clusterOC, EntityType.PROCESS, process, Job.Status.RUNNING); @@ -370,7 +369,7 @@ public class ProcessInstanceStatusTest extends BaseTestClass { List<String> oozieWfIDs = OozieUtil.getWorkflow(clusterOC, bundleId); InstancesResult r = prism.getProcessHelper().getProcessInstanceStatus(processName, "?start=2010-01-02T01:00Z"); - InstanceUtil.validateResponse(r, 5, 1, 0, 4, 0); + InstanceUtil.validateResponse(r, 5, 1, 0, 1, 0); List<String> instanceWfIDs = InstanceUtil.getWorkflowJobIds(r); Assert.assertTrue(matchWorkflows(instanceWfIDs, oozieWfIDs), "No job ids exposed in status message"); }
