You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by ra...@apache.org on 2015/05/18 20:49:52 UTC

falcon git commit: FALCON-1218: Minor fix for testFeedListingAfterFeedDataPathUpdate & testFeedListingAfterFeedAvailabilityFlagUpdate contributed by Raghav Kumar Gautam

Repository: falcon
Updated Branches:
  refs/heads/master fc2179f64 -> fa5690031


FALCON-1218: Minor fix for testFeedListingAfterFeedDataPathUpdate & testFeedListingAfterFeedAvailabilityFlagUpdate contributed by Raghav Kumar Gautam


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

Branch: refs/heads/master
Commit: fa5690031acfee5c65f1f850eb9be65465a3de2e
Parents: fc2179f
Author: Raghav Kumar Gautam <ra...@apache.org>
Authored: Mon May 18 11:48:07 2015 -0700
Committer: Raghav Kumar Gautam <ra...@apache.org>
Committed: Mon May 18 11:49:09 2015 -0700

----------------------------------------------------------------------
 falcon-regression/CHANGES.txt                                    | 3 +++
 .../org/apache/falcon/regression/FeedInstanceListingTest.java    | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/falcon/blob/fa569003/falcon-regression/CHANGES.txt
----------------------------------------------------------------------
diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt
index 296e5b8..f7cdba0 100644
--- a/falcon-regression/CHANGES.txt
+++ b/falcon-regression/CHANGES.txt
@@ -321,6 +321,9 @@ Trunk (Unreleased)
    FALCON-681 delete duplicate feed retention test from falcon regression (SamarthG)
 
   BUG FIXES
+   FALCON-1218 Minor fix for testFeedListingAfterFeedDataPathUpdate & testFeedListingAfterFeedAvailabilityFlagUpdate
+   (Raghav Kumar Gautam)
+
    FALCON-1183 Fix expected response in testScheduleDeletedFeedOnBothColosUsingColoHelper
    (Ruslan Ostafiychuk)
 

http://git-wip-us.apache.org/repos/asf/falcon/blob/fa569003/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedInstanceListingTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedInstanceListingTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedInstanceListingTest.java
index ab885a8..813300d 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedInstanceListingTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedInstanceListingTest.java
@@ -163,7 +163,7 @@ public class FeedInstanceListingTest extends BaseTestClass{
         String inputFeed = bundles[0].getInputFeedFromBundle();
         bundles[0].setInputFeedAvailabilityFlag("_SUCCESS");
         ServiceResponse serviceResponse = prism.getFeedHelper().update(inputFeed, bundles[0].getInputFeedFromBundle(),
-                TimeUtil.getTimeWrtSystemTime(0));
+                TimeUtil.getTimeWrtSystemTime(0), null);
         AssertUtil.assertSucceeded(serviceResponse);
         //Since we have not created availability flag on HDFS, the feed instance status should be partial
         r = prism.getFeedHelper()
@@ -195,7 +195,7 @@ public class FeedInstanceListingTest extends BaseTestClass{
         String inputFeed = bundles[0].getInputFeedFromBundle();
         bundles[0].setInputFeedDataPath(baseTestDir + "/inputNew" + MINUTE_DATE_PATTERN);
         ServiceResponse serviceResponse = prism.getFeedHelper().update(inputFeed, bundles[0].getInputFeedFromBundle(),
-                TimeUtil.getTimeWrtSystemTime(0));
+                TimeUtil.getTimeWrtSystemTime(0), null);
         AssertUtil.assertSucceeded(serviceResponse);
         //Since we have not created directories for new path, the feed instance status should be missing
         r = prism.getFeedHelper()