Repository: ambari Updated Branches: refs/heads/trunk 105d073ab -> e075a2ec4
AMBARI-8778. ADDITIONAL PATCH. Rolling Upgrade - Upgrade Pack needs a Cluster Post-Upgrade to Finalize (alejandro) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e075a2ec Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e075a2ec Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e075a2ec Branch: refs/heads/trunk Commit: e075a2ec4f4daad6803a52987b90aa1068748731 Parents: 105d073 Author: Alejandro Fernandez <[email protected]> Authored: Thu Dec 18 15:14:59 2014 -0800 Committer: Alejandro Fernandez <[email protected]> Committed: Thu Dec 18 15:17:40 2014 -0800 ---------------------------------------------------------------------- .../ambari/server/controller/AmbariManagementControllerTest.java | 2 +- .../server/controller/internal/UpgradeResourceProviderTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e075a2ec/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java index 2d4ac90..72a22e6 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java @@ -6979,7 +6979,7 @@ public class AmbariManagementControllerTest { Assert.assertEquals(1, responsesWithParams.size()); StackVersionResponse resp = responsesWithParams.iterator().next(); assertNotNull(resp.getUpgradePacks()); - assertEquals(1, resp.getUpgradePacks().size()); + assertEquals(2, resp.getUpgradePacks().size()); assertTrue(resp.getUpgradePacks().contains("upgrade_test")); } http://git-wip-us.apache.org/repos/asf/ambari/blob/e075a2ec/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java index dc36648..d2f2d9d 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java @@ -183,11 +183,11 @@ public class UpgradeResourceProviderTest { List<Stage> stages = am.getRequestStatus(requests.get(0).longValue()); - assertEquals(8, stages.size()); + assertEquals(9, stages.size()); List<HostRoleCommand> tasks = am.getRequestTasks(requests.get(0).longValue()); // same number of tasks as stages here - assertEquals(8, tasks.size()); + assertEquals(9, tasks.size()); return status; }
