You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2015/09/09 01:58:15 UTC
ambari git commit: AMBARI-13032 - Automatically Skip Failed Tasks Of
Slaves During Upgrade (part2) (jonathanhurley)
Repository: ambari
Updated Branches:
refs/heads/trunk 8def5a407 -> dca7e5d03
AMBARI-13032 - Automatically Skip Failed Tasks Of Slaves During Upgrade (part2) (jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/dca7e5d0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/dca7e5d0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/dca7e5d0
Branch: refs/heads/trunk
Commit: dca7e5d03e78b34fc2a9718182127494e772e48b
Parents: 8def5a4
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Tue Sep 8 19:58:03 2015 -0400
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Tue Sep 8 19:58:03 2015 -0400
----------------------------------------------------------------------
.../server/controller/internal/RequestResourceProviderTest.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/dca7e5d0/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestResourceProviderTest.java
index d150ab1..9b63358 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestResourceProviderTest.java
@@ -18,8 +18,6 @@
package org.apache.ambari.server.controller.internal;
-import static org.easymock.EasyMock.and;
-import static org.easymock.EasyMock.anyLong;
import static org.easymock.EasyMock.anyObject;
import static org.easymock.EasyMock.capture;
import static org.easymock.EasyMock.createMock;
@@ -828,7 +826,8 @@ public class RequestResourceProviderTest {
status == HostRoleStatus.ABORTED ||
status == HostRoleStatus.FAILED ||
status == HostRoleStatus.TIMEDOUT ||
- status == HostRoleStatus.QUEUED) { // the only valid cases
+ status == HostRoleStatus.QUEUED ||
+ status == HostRoleStatus.SKIPPED_FAILED) { // the only valid cases
provider.updateResources(request, predicate);
} else { // In other cases, should error out
try {