You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by ro...@apache.org on 2015/04/29 15:37:46 UTC
falcon git commit: FALCON-1183 Fix expected response in
testScheduleDeletedFeedOnBothColosUsingColoHelper. Contributed by Ruslan
Ostafiychuk
Repository: falcon
Updated Branches:
refs/heads/master a421c888f -> 728eb36c0
FALCON-1183 Fix expected response in testScheduleDeletedFeedOnBothColosUsingColoHelper. Contributed by Ruslan Ostafiychuk
Project: http://git-wip-us.apache.org/repos/asf/falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/728eb36c
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/728eb36c
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/728eb36c
Branch: refs/heads/master
Commit: 728eb36c0d00153bdaba9acbc910087ab7c7d5ac
Parents: a421c88
Author: Ruslan Ostafiychuk <ro...@apache.org>
Authored: Wed Apr 29 16:10:26 2015 +0300
Committer: Ruslan Ostafiychuk <ro...@apache.org>
Committed: Wed Apr 29 16:13:48 2015 +0300
----------------------------------------------------------------------
falcon-regression/CHANGES.txt | 3 +++
.../org/apache/falcon/regression/prism/PrismFeedSnSTest.java | 8 ++++----
2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/falcon/blob/728eb36c/falcon-regression/CHANGES.txt
----------------------------------------------------------------------
diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt
index c81f25d..cfae2f8 100644
--- a/falcon-regression/CHANGES.txt
+++ b/falcon-regression/CHANGES.txt
@@ -305,6 +305,9 @@ Trunk (Unreleased)
FALCON-681 delete duplicate feed retention test from falcon regression (SamarthG)
BUG FIXES
+ FALCON-1183 Fix expected response in testScheduleDeletedFeedOnBothColosUsingColoHelper
+ (Ruslan Ostafiychuk)
+
FALCON-1176 Fixing EntitiesPatternSearchTest failing as a result of FALCON-1158 (Pragya Mittal
via Ruslan Ostafiychuk)
http://git-wip-us.apache.org/repos/asf/falcon/blob/728eb36c/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedSnSTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedSnSTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedSnSTest.java
index 1ef0429..dee8e33 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedSnSTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedSnSTest.java
@@ -322,10 +322,10 @@ public class PrismFeedSnSTest extends BaseTestClass {
AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(feed1));
AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(feed2));
- Assert.assertEquals(Util.parseResponse(prism.getFeedHelper().getStatus(
- feed1)).getMessage(), cluster1.getClusterHelper().getColoName() + "/RUNNING");
- Assert.assertEquals(Util.parseResponse(prism.getFeedHelper().getStatus(
- feed2)).getMessage(), cluster2.getClusterHelper().getColoName() + "/RUNNING");
+ Assert.assertEquals(Util.parseResponse(prism.getFeedHelper().getStatus(feed1))
+ .getMessage().trim(), cluster1.getClusterHelper().getColoName() + "/RUNNING");
+ Assert.assertEquals(Util.parseResponse(prism.getFeedHelper().getStatus(feed2))
+ .getMessage().trim(), cluster2.getClusterHelper().getColoName() + "/RUNNING");
}
/**