You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by sa...@apache.org on 2015/01/14 10:27:52 UTC

falcon git commit: FALCON-989 add timeout to EmbeddedPigScriptTest in falcon regression contributed by Samarth Gupta

Repository: falcon
Updated Branches:
  refs/heads/master b0b9c216b -> e21696bd3


FALCON-989 add timeout to EmbeddedPigScriptTest in falcon regression contributed by Samarth Gupta


Project: http://git-wip-us.apache.org/repos/asf/falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/e21696bd
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/e21696bd
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/e21696bd

Branch: refs/heads/master
Commit: e21696bd3a16b70139fc399d353935b33975216c
Parents: b0b9c21
Author: samarthg <sa...@apacge.org>
Authored: Wed Jan 14 14:57:10 2015 +0530
Committer: samarthg <sa...@apacge.org>
Committed: Wed Jan 14 14:57:10 2015 +0530

----------------------------------------------------------------------
 falcon-regression/CHANGES.txt                             |  3 +++
 .../apache/falcon/regression/EmbeddedPigScriptTest.java   | 10 +++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/falcon/blob/e21696bd/falcon-regression/CHANGES.txt
----------------------------------------------------------------------
diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt
index d84a470..fb649c8 100644
--- a/falcon-regression/CHANGES.txt
+++ b/falcon-regression/CHANGES.txt
@@ -39,6 +39,9 @@ Trunk (Unreleased)
    via Samarth Gupta)
 
   IMPROVEMENTS
+
+   FALCON-989 add timeout to EmbeddedPigScriptTest in falcon regression (Samarth Gupta)
+
    FALCON-978 Refactoring FeedLateRerunTest to be parametrized test (Paul Isaychuk via Ruslan Ostafiychuk)
 
    FALCON-979 Fix checkstyle issues introduced by falcon-976 (Raghav Kumar Gautam via Ruslan Ostafiychuk)

http://git-wip-us.apache.org/repos/asf/falcon/blob/e21696bd/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/EmbeddedPigScriptTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/EmbeddedPigScriptTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/EmbeddedPigScriptTest.java
index bdd5c00..c0113cd 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/EmbeddedPigScriptTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/EmbeddedPigScriptTest.java
@@ -118,7 +118,7 @@ public class EmbeddedPigScriptTest extends BaseTestClass {
         removeBundles();
     }
 
-    @Test(groups = {"singleCluster"})
+    @Test(groups = {"singleCluster"}, timeOut = 600000)
     public void getResumedProcessInstance() throws Exception {
         AssertUtil.checkStatus(clusterOC, EntityType.PROCESS, process, Job.Status.RUNNING);
         prism.getProcessHelper().suspend(process);
@@ -132,7 +132,7 @@ public class EmbeddedPigScriptTest extends BaseTestClass {
         InstanceUtil.validateSuccess(r, bundles[0], WorkflowStatus.RUNNING);
     }
 
-    @Test(groups = {"singleCluster"})
+    @Test(groups = {"singleCluster"}, timeOut = 600000)
     public void getSuspendedProcessInstance() throws Exception {
         prism.getProcessHelper().suspend(process);
         TimeUtil.sleepSeconds(TIMEOUT);
@@ -141,7 +141,7 @@ public class EmbeddedPigScriptTest extends BaseTestClass {
         InstanceUtil.validateSuccessWOInstances(r);
     }
 
-    @Test(groups = {"singleCluster"})
+    @Test(groups = {"singleCluster"}, timeOut = 600000)
     public void getRunningProcessInstance() throws Exception {
         AssertUtil.checkStatus(clusterOC, EntityType.PROCESS, process, Job.Status.RUNNING);
         TimeUtil.sleepSeconds(TIMEOUT);
@@ -149,7 +149,7 @@ public class EmbeddedPigScriptTest extends BaseTestClass {
         InstanceUtil.validateSuccess(r, bundles[0], WorkflowStatus.RUNNING);
     }
 
-    @Test(groups = {"singleCluster"})
+    @Test(groups = {"singleCluster"}, timeOut = 600000)
     public void getKilledProcessInstance() throws Exception {
         prism.getProcessHelper().delete(process);
         TimeUtil.sleepSeconds(TIMEOUT);
@@ -157,7 +157,7 @@ public class EmbeddedPigScriptTest extends BaseTestClass {
         InstanceUtil.validateError(r, ResponseErrors.PROCESS_NOT_FOUND);
     }
 
-    @Test(groups = {"singleCluster"})
+    @Test(groups = {"singleCluster"}, timeOut = 6000000)
     public void getSucceededProcessInstance() throws Exception {
         AssertUtil.checkStatus(clusterOC, EntityType.PROCESS, process, Job.Status.RUNNING);
         InstancesResult r = prism.getProcessHelper().getRunningInstance(processName);