Repository: falcon Updated Branches: refs/heads/master 27a69b185 -> c462f3e05
FALCON-1489 Partial status http response code returns 200. Contributed by Pragya Mittal. Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/c462f3e0 Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/c462f3e0 Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/c462f3e0 Branch: refs/heads/master Commit: c462f3e058e97bfa159932ec18286f4095834ba8 Parents: 27a69b1 Author: Ajay Yadava <[email protected]> Authored: Sat Sep 26 00:10:18 2015 +0530 Committer: Ajay Yadava <[email protected]> Committed: Sat Sep 26 00:13:22 2015 +0530 ---------------------------------------------------------------------- falcon-regression/CHANGES.txt | 2 ++ .../java/org/apache/falcon/regression/core/util/AssertUtil.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/c462f3e0/falcon-regression/CHANGES.txt ---------------------------------------------------------------------- diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt index af5e660..1aff5a4 100644 --- a/falcon-regression/CHANGES.txt +++ b/falcon-regression/CHANGES.txt @@ -366,6 +366,8 @@ Trunk (Unreleased) FALCON-681 delete duplicate feed retention test from falcon regression (SamarthG) BUG FIXES + FALCON-1489 Partial status http response code returns 200(Pragya Mittal via Ajay Yadava) + FALCON-1388 Fix merge conflicts produced by FALCON-1002 (Paul Isaychuk) FALCON-1002 Disable UpdateAtSpecific time test from falcon regression(Samarth Gupta via Ajay Yadava) http://git-wip-us.apache.org/repos/asf/falcon/blob/c462f3e0/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/AssertUtil.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/AssertUtil.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/AssertUtil.java index f984457..1546415 100644 --- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/AssertUtil.java +++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/AssertUtil.java @@ -247,7 +247,7 @@ public final class AssertUtil { */ public static void assertPartial(ServiceResponse response) throws JAXBException { Assert.assertEquals(Util.parseResponse(response).getStatus(), APIResult.Status.PARTIAL); - Assert.assertEquals(response.getCode(), 400); + Assert.assertEquals(response.getCode(), 200); Assert.assertNotNull(Util.parseResponse(response).getMessage()); }
