falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From samar...@apache.org
Subject [1/2] falcon git commit: FALCON-1075 Fixing ProcessFrequencyTest, EntityDryRunTest, ProcessInstanceRerunTest which are failing as part of falcon regression. Contributed by Pragya M
Date Mon, 16 Mar 2015 04:30:37 GMT
Repository: falcon
Updated Branches:
  refs/heads/master 1d7ca192b -> 7ba3da6b9


FALCON-1075 Fixing ProcessFrequencyTest, EntityDryRunTest, ProcessInstanceRerunTest which
are failing as part of falcon regression. Contributed by Pragya M


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

Branch: refs/heads/master
Commit: 2d089107ceef3383ea62bc4e151f5f8d7d11aeb1
Parents: 1d7ca19
Author: samarthg <samarthg@apacge.org>
Authored: Mon Mar 16 04:24:53 2015 +0000
Committer: samarthg <samarthg@apacge.org>
Committed: Mon Mar 16 04:24:53 2015 +0000

----------------------------------------------------------------------
 falcon-regression/CHANGES.txt                                    | 4 ++++
 .../java/org/apache/falcon/regression/ProcessFrequencyTest.java  | 2 +-
 .../org/apache/falcon/regression/ProcessInstanceRerunTest.java   | 4 ++--
 .../org/apache/falcon/regression/prism/EntityDryRunTest.java     | 4 ++--
 4 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/falcon/blob/2d089107/falcon-regression/CHANGES.txt
----------------------------------------------------------------------
diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt
index 3e32d78..00efc33 100644
--- a/falcon-regression/CHANGES.txt
+++ b/falcon-regression/CHANGES.txt
@@ -60,6 +60,10 @@ Trunk (Unreleased)
    via Samarth Gupta)
 
   IMPROVEMENTS
+
+   FALCON-1075 Fixing ProcessFrequencyTest, EntityDryRunTest, ProcessInstanceRerunTest 
+   which are failing as part of falcon regression (Pragya M via Samarth G)
+
    FALCON-1094 getAllFilesRecursivelyHDFS without recursive call (Ruslan Ostafiychuk)
 
    FALCON-1093 Tag all new tests added to falcon-regression (Paul Isaychuk via Ruslan Ostafiychuk)

http://git-wip-us.apache.org/repos/asf/falcon/blob/2d089107/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessFrequencyTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessFrequencyTest.java
b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessFrequencyTest.java
index 0a0f0a7..8cf2862 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessFrequencyTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessFrequencyTest.java
@@ -95,10 +95,10 @@ public class ProcessFrequencyTest extends BaseTestClass {
         bundles[0].setProcessPeriodicity(freqAmount, freqType.getFalconTimeUnit());
         bundles[0].setProcessInputStartEnd("now(0,0)", "now(0,0)");
         bundles[0].setProcessValidity(startDate, endDate);
+        HadoopUtil.deleteDirIfExists(inputPath, clusterFS);
         bundles[0].submitFeedsScheduleProcess(prism);
 
         //upload data
-        HadoopUtil.deleteDirIfExists(inputPath, clusterFS);
         final String startPath = inputPath + freqType.getFormatter().print(
             TimeUtil.oozieDateToDate(startDate));
         HadoopUtil.copyDataToFolder(clusterFS, startPath, OSUtil.NORMAL_INPUT);

http://git-wip-us.apache.org/repos/asf/falcon/blob/2d089107/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceRerunTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceRerunTest.java
b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceRerunTest.java
index 0ae9f6f..c65461c 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceRerunTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceRerunTest.java
@@ -284,7 +284,7 @@ public class ProcessInstanceRerunTest extends BaseTestClass {
         InstanceUtil.waitTillInstanceReachState(clusterOC, processName, 0, CoordinatorAction
             .Status.SUCCEEDED, EntityType.PROCESS);
         prism.getProcessHelper().getProcessInstanceRerun(processName,
-                start + "&end=2010-01-02T01:01Z");
+                start + "&end=2010-01-02T01:01Z&force=true");
         Assert.assertTrue(InstanceUtil.isWorkflowRunning(clusterOC, wfID));
     }
 
@@ -329,7 +329,7 @@ public class ProcessInstanceRerunTest extends BaseTestClass {
             CoordinatorAction.Status.SUCCEEDED, EntityType.PROCESS);
         List<String> wfIDs = InstanceUtil.getWorkflows(cluster, processName);
         prism.getProcessHelper().getProcessInstanceRerun(processName,
-            start + "&end=2010-01-02T01:11Z");
+                start + "&end=2010-01-02T01:11Z&force=true");
         InstanceUtil.areWorkflowsRunning(clusterOC, wfIDs, 3, 3, 0, 0);
     }
 

http://git-wip-us.apache.org/repos/asf/falcon/blob/2d089107/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/EntityDryRunTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/EntityDryRunTest.java
b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/EntityDryRunTest.java
index 700a7e1..e87579f 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/EntityDryRunTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/EntityDryRunTest.java
@@ -89,7 +89,7 @@ public class EntityDryRunTest extends BaseTestClass {
         bundles[0].submitProcess(true);
         ServiceResponse response = prism.getProcessHelper().schedule(bundles[0].getProcessData());
         validate(response,
-            "E1004: Expression language evaluation error, Unable to evaluate :${coord:someEL(1)");
+                "Entity schedule failed for process: " + bundles[0].getProcessName());
     }
 
     /**
@@ -120,7 +120,7 @@ public class EntityDryRunTest extends BaseTestClass {
         bundles[0].submitClusters(prism);
         ServiceResponse response = prism.getFeedHelper().submitAndSchedule(feed);
         validate(response,
-            "E1004: Expression language evaluation error, Unable to evaluate :${coord:someEL(1)");
+                "Entity schedule failed for feed: " + bundles[0].getInputFeedNameFromBundle());
     }
 
     /**


Mime
View raw message