Repository: ambari Updated Branches: refs/heads/trunk d21d434a1 -> e2fbd0f06
AMBARI-21054. Add ppc as a new OS for User. (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e2fbd0f0 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e2fbd0f0 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e2fbd0f0 Branch: refs/heads/trunk Commit: e2fbd0f0675d68e54765d83a07a2ea825e2d3821 Parents: d21d434 Author: Andrew Onishuk <aonis...@hortonworks.com> Authored: Thu Jun 8 15:23:29 2017 +0300 Committer: Andrew Onishuk <aonis...@hortonworks.com> Committed: Thu Jun 8 15:23:29 2017 +0300 ---------------------------------------------------------------------- .../server/controller/AmbariManagementControllerImplTest.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e2fbd0f0/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java index fde9260..0312579 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java @@ -101,6 +101,7 @@ import org.apache.ambari.server.state.ServiceOsSpecific; import org.apache.ambari.server.state.StackId; import org.apache.ambari.server.state.StackInfo; import org.apache.ambari.server.state.State; +import org.apache.ambari.server.state.stack.OsFamily; import org.easymock.Capture; import org.easymock.EasyMock; import org.junit.Before; @@ -133,6 +134,7 @@ public class AmbariManagementControllerImplTest { private static final AmbariMetaInfo ambariMetaInfo = createMock(AmbariMetaInfo.class); private static final Users users = createMock(Users.class); private static final AmbariSessionManager sessionManager = createNiceMock(AmbariSessionManager.class); + private static final OsFamily osFamily = createNiceMock(OsFamily.class); @BeforeClass public static void setupAuthentication() { @@ -144,7 +146,7 @@ public class AmbariManagementControllerImplTest { @Before public void before() throws Exception { - reset(ldapDataPopulator, clusters, actionDBAccessor, ambariMetaInfo, users, sessionManager); + reset(ldapDataPopulator, clusters, actionDBAccessor, ambariMetaInfo, users, sessionManager, osFamily); } @Test @@ -1988,7 +1990,7 @@ public class AmbariManagementControllerImplTest { @Test public void testPopulateServicePackagesInfo() throws Exception { Capture<AmbariManagementController> controllerCapture = EasyMock.newCapture(); - Injector injector = createStrictMock(Injector.class); + Injector injector = Guice.createInjector(Modules.override(new InMemoryDefaultTestModule()).with(new MockModule())); MaintenanceStateHelper maintHelper = createNiceMock(MaintenanceStateHelper.class); ServiceInfo serviceInfo = createNiceMock(ServiceInfo.class); @@ -2198,6 +2200,7 @@ public class AmbariManagementControllerImplTest { binder.bind(AmbariMetaInfo.class).toInstance(ambariMetaInfo); binder.bind(Users.class).toInstance(users); binder.bind(AmbariSessionManager.class).toInstance(sessionManager); + binder.bind(OsFamily.class).toInstance(osFamily); } }
