Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 82C5517773 for ; Wed, 4 Feb 2015 15:09:51 +0000 (UTC) Received: (qmail 39799 invoked by uid 500); 4 Feb 2015 15:09:52 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 39769 invoked by uid 500); 4 Feb 2015 15:09:52 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 39760 invoked by uid 99); 4 Feb 2015 15:09:52 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Feb 2015 15:09:52 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4FFD2E01D9; Wed, 4 Feb 2015 15:09:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tbeerbower@apache.org To: commits@ambari.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-9456 - Add a 'Prepare Backups' Stage to Rolling Upgrade before ZooKeeper : fix null HostsType (tbeerbower) Date: Wed, 4 Feb 2015 15:09:52 +0000 (UTC) Repository: ambari Updated Branches: refs/heads/trunk 3beda060b -> 3e69d3a75 AMBARI-9456 - Add a 'Prepare Backups' Stage to Rolling Upgrade before ZooKeeper : fix null HostsType (tbeerbower) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3e69d3a7 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3e69d3a7 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3e69d3a7 Branch: refs/heads/trunk Commit: 3e69d3a75b74af3275a78eba01d65d68476b70b2 Parents: 3beda06 Author: tbeerbower Authored: Wed Feb 4 10:09:24 2015 -0500 Committer: tbeerbower Committed: Wed Feb 4 10:09:44 2015 -0500 ---------------------------------------------------------------------- .../controller/internal/UpgradeResourceProviderTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/3e69d3a7/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 976eb53..00ba387 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 @@ -231,11 +231,11 @@ public class UpgradeResourceProviderTest { List stages = am.getRequestStatus(requests.get(0).longValue()); - assertEquals(10, stages.size()); + assertEquals(9, stages.size()); List tasks = am.getRequestTasks(requests.get(0).longValue()); // same number of tasks as stages here - assertEquals(10, tasks.size()); + assertEquals(9, tasks.size()); Set slaveStageIds = new HashSet(); @@ -322,7 +322,7 @@ public class UpgradeResourceProviderTest { ResourceProvider upgradeItemResourceProvider = new UpgradeItemResourceProvider(amc); resources = upgradeItemResourceProvider.getResources(request, predicate); - assertEquals(3, resources.size()); + assertEquals(2, resources.size()); res = resources.iterator().next(); assertNotNull(res.getPropertyValue("UpgradeItem/status"));