Repository: ambari Updated Branches: refs/heads/branch-2.4 a77fab239 -> 67f6869fe refs/heads/trunk 83f8add98 -> b0bc550c1
Fix broken unit tests Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b0bc550c Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b0bc550c Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b0bc550c Branch: refs/heads/trunk Commit: b0bc550c167ba6e6f0509c34c89f164a4f959fe7 Parents: 83f8add Author: Lisnichenko Dmitro <[email protected]> Authored: Mon Jun 6 17:29:12 2016 +0300 Committer: Lisnichenko Dmitro <[email protected]> Committed: Mon Jun 6 18:26:21 2016 +0300 ---------------------------------------------------------------------- .../ambari/server/stack/StackManagerCommonServicesTest.java | 2 +- .../org/apache/ambari/server/stack/StackManagerMiscTest.java | 6 +++--- .../org/apache/ambari/server/stack/StackManagerTest.java | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b0bc550c/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerCommonServicesTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerCommonServicesTest.java b/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerCommonServicesTest.java index 182df79..969e07c 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerCommonServicesTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerCommonServicesTest.java @@ -97,7 +97,7 @@ public class StackManagerCommonServicesTest { replay(metaInfoDao, actionMetadata); StackManager stackManager = new StackManager(new File(stackRoot), new File( - commonServicesRoot), osFamily, true, metaInfoDao, actionMetadata, stackDao); + commonServicesRoot), osFamily, false, metaInfoDao, actionMetadata, stackDao); EasyMock.verify( config, stackDao ); http://git-wip-us.apache.org/repos/asf/ambari/blob/b0bc550c/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerMiscTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerMiscTest.java b/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerMiscTest.java index b1f7cd1..55a3c46 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerMiscTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerMiscTest.java @@ -62,7 +62,7 @@ public class StackManagerMiscTest { String stacksCycle1 = ClassLoader.getSystemClassLoader().getResource("stacks_with_cycle").getPath(); StackManager stackManager = new StackManager(new File(stacksCycle1), - null, osFamily, true, metaInfoDao, actionMetadata, stackDao); + null, osFamily, false, metaInfoDao, actionMetadata, stackDao); fail("Expected exception due to cyclic stack"); } catch (AmbariException e) { @@ -108,7 +108,7 @@ public class StackManagerMiscTest { StackManager stackManager = new StackManager(new File(singleStack.replace( StackManager.PATH_DELIMITER, File.separator)), - null, osFamily, true, metaInfoDao, actionMetadata, stackDao); + null, osFamily, false, metaInfoDao, actionMetadata, stackDao); Collection<StackInfo> stacks = stackManager.getStacks(); @@ -140,7 +140,7 @@ public class StackManagerMiscTest { String upgradeCycle = ClassLoader.getSystemClassLoader().getResource("stacks_with_upgrade_cycle").getPath(); StackManager stackManager = new StackManager(new File(upgradeCycle), - null, osFamily, true, metaInfoDao, actionMetadata, stackDao); + null, osFamily, false, metaInfoDao, actionMetadata, stackDao); fail("Expected exception due to cyclic service upgrade xml"); } catch (AmbariException e) { http://git-wip-us.apache.org/repos/asf/ambari/blob/b0bc550c/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 3919fec..3a16418 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 @@ -101,7 +101,7 @@ public class StackManagerTest { osFamily = new OsFamily(config); StackManager stackManager = new StackManager(new File(stackRoot), null, - osFamily, true, metaInfoDao, actionMetadata, stackDao); + osFamily, false, metaInfoDao, actionMetadata, stackDao); verify(config, metaInfoDao, stackDao, actionMetadata); @@ -667,7 +667,7 @@ public class StackManagerTest { OsFamily osFamily = new OsFamily(config); StackManager stackManager = new StackManager(stackRoot, commonServices, - osFamily, true, metaInfoDao, actionMetadata, stackDao); + osFamily, false, metaInfoDao, actionMetadata, stackDao); for (StackInfo stackInfo : stackManager.getStacks()) { for (ServiceInfo serviceInfo : stackInfo.getServices()) { @@ -710,7 +710,7 @@ public class StackManagerTest { OsFamily osFamily = new OsFamily(config); - StackManager stackManager = new StackManager(stackRoot, commonServices, osFamily, true, metaInfoDao, actionMetadata, stackDao); + StackManager stackManager = new StackManager(stackRoot, commonServices, osFamily, false, metaInfoDao, actionMetadata, stackDao); String rangerUserSyncRoleCommand = Role.RANGER_USERSYNC + "-" + RoleCommand.START; String rangerAdminRoleCommand = Role.RANGER_ADMIN + "-" + RoleCommand.START; @@ -817,7 +817,7 @@ public class StackManagerTest { OsFamily osFamily = new OsFamily(config); - StackManager stackManager = new StackManager(stackRoot, commonServices, osFamily, true, metaInfoDao, actionMetadata, stackDao); + StackManager stackManager = new StackManager(stackRoot, commonServices, osFamily, false, metaInfoDao, actionMetadata, stackDao); String zookeeperServerRoleCommand = Role.ZOOKEEPER_SERVER + "-" + RoleCommand.START; String logsearchServerRoleCommand = Role.LOGSEARCH_SERVER + "-" + RoleCommand.START;
