ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tbeerbo...@apache.org
Subject ambari git commit: AMBARI-9456 - Add a 'Prepare Backups' Stage to Rolling Upgrade before ZooKeeper : fix null HostsType (tbeerbower)
Date Wed, 04 Feb 2015 15:09:52 GMT
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 <tbeerbower@hortonworks.com>
Authored: Wed Feb 4 10:09:24 2015 -0500
Committer: tbeerbower <tbeerbower@hortonworks.com>
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<Stage> stages = am.getRequestStatus(requests.get(0).longValue());
 
-    assertEquals(10, stages.size());
+    assertEquals(9, stages.size());
 
     List<HostRoleCommand> tasks = am.getRequestTasks(requests.get(0).longValue());
     // same number of tasks as stages here
-    assertEquals(10, tasks.size());
+    assertEquals(9, tasks.size());
 
     Set<Long> slaveStageIds = new HashSet<Long>();
 
@@ -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"));


Mime
View raw message