You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rl...@apache.org on 2015/10/29 18:33:24 UTC
ambari git commit: AMBARI-13637. Fix StackManager
testServicesWithRangerPluginRoleCommandOrder unit test (Sebastian Toader via
rlevas)
Repository: ambari
Updated Branches:
refs/heads/trunk c1985dac9 -> 026816d41
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/026816d4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/026816d4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/026816d4
Branch: refs/heads/trunk
Commit: 026816d41675974a4d164f8e0c344270327b139f
Parents: c1985da
Author: Sebastian Toader <st...@hortonworks.com>
Authored: Thu Oct 29 13:33:07 2015 -0400
Committer: Robert Levas <rl...@hortonworks.com>
Committed: Thu Oct 29 13:33:16 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/026816d4/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 0a7bc74..dd92bd5 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
@@ -704,19 +704,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));