Repository: ambari Updated Branches: refs/heads/branch-2.1 c178ea32c -> 657ccbee6
AMBARI-13637. Fix StackManager testServicesWithRangerPluginRoleCommandOrder unit test (Sebastian Toader via rlevas) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/657ccbee Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/657ccbee Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/657ccbee Branch: refs/heads/branch-2.1 Commit: 657ccbee64935c4dac3f098c17a295b4e9433c09 Parents: c178ea3 Author: Sebastian Toader <[email protected]> Authored: Thu Oct 29 13:50:27 2015 -0400 Committer: Robert Levas <[email protected]> Committed: Thu Oct 29 13:50:32 2015 -0400 ---------------------------------------------------------------------- .../org/apache/ambari/server/stack/StackManagerTest.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/657ccbee/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerTest.java index 407837c..4af0267 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerTest.java @@ -693,19 +693,17 @@ public class StackManagerTest { // verify that services that have ranger plugin are after ranger admin in the role command order sequence // as these services require ranger admin and ranger user sync to up upfront Map<String, Object> generalDeps = (Map<String, Object>)rco.get("general_deps"); - Map<String, Object> optionalGlusterfs = (Map<String, Object>)rco.get("optional_glusterfs"); Map<String, Object> optionalNoGlusterfs = (Map<String, Object>)rco.get("optional_no_glusterfs"); - Map<String, Object> namenodeOptionalHa = (Map<String, Object>)rco.get("namenode_optional_ha"); - Map<String, Object> resourcemanagerOptionalHa = (Map<String, Object>)rco.get("resourcemanager_optional_ha"); + // HDFS String nameNodeRoleCommand = Role.NAMENODE + "-" + RoleCommand.START; - ArrayList<String> nameNodeBlockers = (ArrayList<String>)generalDeps.get(nameNodeRoleCommand); + ArrayList<String> nameNodeBlockers = (ArrayList<String>)optionalNoGlusterfs.get(nameNodeRoleCommand); assertTrue(nameNodeRoleCommand + " should be dependent of " + rangerUserSyncRoleCommand, nameNodeBlockers.contains(rangerUserSyncRoleCommand)); String dataNodeRoleCommand = Role.DATANODE + "-" + RoleCommand.START; - ArrayList<String> dataNodeBlockers = (ArrayList<String>)generalDeps.get(dataNodeRoleCommand); + ArrayList<String> dataNodeBlockers = (ArrayList<String>)optionalNoGlusterfs.get(dataNodeRoleCommand); assertTrue(dataNodeRoleCommand + " should be dependent of " + rangerUserSyncRoleCommand, dataNodeBlockers.contains(rangerUserSyncRoleCommand));
