falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rostafiyc...@apache.org
Subject incubator-falcon git commit: FALCON-937 Fix tests that are still using hdfs root dir in feeds. Contributed by Raghav Kumar Gautam
Date Tue, 09 Dec 2014 11:11:53 GMT
Repository: incubator-falcon
Updated Branches:
  refs/heads/master c14c7b470 -> 2ebfdc155


FALCON-937 Fix tests that are still using hdfs root dir in feeds. Contributed by Raghav Kumar
Gautam


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

Branch: refs/heads/master
Commit: 2ebfdc155b740590474119bb4f1463a3a4068b6c
Parents: c14c7b4
Author: Ruslan Ostafiychuk <rostafiychuk@apache.org>
Authored: Tue Dec 9 13:09:26 2014 +0200
Committer: Ruslan Ostafiychuk <rostafiychuk@apache.org>
Committed: Tue Dec 9 13:09:26 2014 +0200

----------------------------------------------------------------------
 falcon-regression/CHANGES.txt                                | 3 +++
 .../apache/falcon/regression/ELExpFutureAndLatestTest.java   | 8 +++++---
 .../org/apache/falcon/regression/InstanceSummaryTest.java    | 1 +
 .../test/java/org/apache/falcon/regression/NewRetryTest.java | 2 +-
 .../falcon/regression/lineage/ListProcessInstancesTest.java  | 4 ++--
 5 files changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/2ebfdc15/falcon-regression/CHANGES.txt
----------------------------------------------------------------------
diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt
index 58077e0..87eed47 100644
--- a/falcon-regression/CHANGES.txt
+++ b/falcon-regression/CHANGES.txt
@@ -172,6 +172,9 @@ Trunk (Unreleased)
    FALCON-681 delete duplicate feed retention test from falcon regression (SamarthG)
 
   BUG FIXES
+   FALCON-937 Fix tests that are still using hdfs root dir in feeds (Raghav Kumar Gautam
+   via Ruslan Ostafiychuk)
+
    FALCON-936 Replace deprecated WorkflowJob.getGroup() with getAcl().
    (Ruslan Ostafiychuk via Raghav Kumar Gautam)
 

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/2ebfdc15/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELExpFutureAndLatestTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELExpFutureAndLatestTest.java
b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELExpFutureAndLatestTest.java
index 978d522..c031ab6 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELExpFutureAndLatestTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELExpFutureAndLatestTest.java
@@ -51,7 +51,7 @@ public class ELExpFutureAndLatestTest extends BaseTestClass {
     private ColoHelper cluster = servers.get(0);
     private FileSystem clusterFS = serverFS.get(0);
     private OozieClient clusterOC = serverOC.get(0);
-    private String baseTestDir = baseHDFSDir + "/ELExp_FutureAndLatest";
+    private String baseTestDir = baseHDFSDir + "/ELExpFutureAndLatestTest";
     private String aggregateWorkflowDir = baseTestDir + "/aggregator";
     private static final Logger LOGGER = Logger.getLogger(ELExpFutureAndLatestTest.class);
 
@@ -67,7 +67,7 @@ public class ELExpFutureAndLatestTest extends BaseTestClass {
         String startDate = TimeUtil.getTimeWrtSystemTime(-20);
         String endDate = TimeUtil.getTimeWrtSystemTime(70);
 
-        b.setInputFeedDataPath(baseTestDir + "/ELExp_latest/testData" + MINUTE_DATE_PATTERN);
+        b.setInputFeedDataPath(baseTestDir + "/testData" + MINUTE_DATE_PATTERN);
         b.setProcessWorkflow(aggregateWorkflowDir);
 
         List<String> dataDates = TimeUtil.getMinuteDatesOnEitherSide(startDate, endDate,
1);
@@ -82,7 +82,9 @@ public class ELExpFutureAndLatestTest extends BaseTestClass {
         bundles[0] = BundleUtil.readELBundle();
         bundles[0] = new Bundle(bundles[0], cluster);
         bundles[0].generateUniqueBundle();
-        bundles[0].setInputFeedDataPath(baseTestDir + "/ELExp_latest/testData"
+        bundles[0].setInputFeedDataPath(baseTestDir + "/testData"
+            + MINUTE_DATE_PATTERN);
+        bundles[0].setOutputFeedLocationData(baseTestDir + "/output"
             + MINUTE_DATE_PATTERN);
         bundles[0].setInputFeedPeriodicity(5, TimeUnit.minutes);
         bundles[0].setInputFeedValidity("2010-04-01T00:00Z", "2015-04-01T00:00Z");

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/2ebfdc15/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/InstanceSummaryTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/InstanceSummaryTest.java
b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/InstanceSummaryTest.java
index da35e4c..287572b 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/InstanceSummaryTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/InstanceSummaryTest.java
@@ -91,6 +91,7 @@ public class InstanceSummaryTest extends BaseTestClass {
         processBundle = new Bundle(processBundle, cluster3);
         processBundle.generateUniqueBundle();
         processBundle.setInputFeedDataPath(feedInputPath);
+        processBundle.setOutputFeedLocationData(baseTestHDFSDir + "/output" + MINUTE_DATE_PATTERN);
         processBundle.setProcessWorkflow(aggregateWorkflowDir);
 
         for (int i = 0; i < 3; i++) {

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/2ebfdc15/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/NewRetryTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/NewRetryTest.java
b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/NewRetryTest.java
index 99a42fd..ed6523d 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/NewRetryTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/NewRetryTest.java
@@ -102,7 +102,7 @@ public class NewRetryTest extends BaseTestClass {
         feed = Util.insertLateFeedValue(feed, new Frequency("minutes(8)"));
         bundles[0].getDataSets().remove(bundles[0].getInputFeedFromBundle());
         bundles[0].getDataSets().add(feed);
-
+        bundles[0].setOutputFeedLocationData(baseTestDir + "/output" + MINUTE_DATE_PATTERN);
         bundles[0].submitClusters(prism);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/2ebfdc15/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/ListProcessInstancesTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/ListProcessInstancesTest.java
b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/ListProcessInstancesTest.java
index c469f95..485d121 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/ListProcessInstancesTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/ListProcessInstancesTest.java
@@ -50,8 +50,7 @@ public class ListProcessInstancesTest extends BaseTestClass {
     private static final Logger LOGGER = Logger.getLogger(ListProcessInstancesTest.class);
     private ColoHelper cluster = servers.get(0);
     private OozieClient clusterOC = serverOC.get(0);
-    private String testDir = "/ListProcessInstancesTest";
-    private String baseTestHDFSDir = baseHDFSDir + testDir;
+    private String baseTestHDFSDir = baseHDFSDir + "/ListProcessInstancesTest";
     private String aggregateWorkflowDir = baseTestHDFSDir + "/aggregator";
     private String sourcePath = baseTestHDFSDir + "/source";
     private String feedDataLocation = sourcePath + MINUTE_DATE_PATTERN;
@@ -74,6 +73,7 @@ public class ListProcessInstancesTest extends BaseTestClass {
         //prepare process
         bundles[0].setProcessWorkflow(aggregateWorkflowDir);
         bundles[0].setInputFeedDataPath(feedDataLocation);
+        bundles[0].setOutputFeedLocationData(baseTestHDFSDir + "/output" + MINUTE_DATE_PATTERN);
         bundles[0].setProcessValidity(startTime, endTime);
         bundles[0].setProcessConcurrency(3);
         bundles[0].submitAndScheduleProcess();


Mime
View raw message