Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 02314200C92 for ; Mon, 12 Jun 2017 18:45:14 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 00F5E160BF2; Mon, 12 Jun 2017 16:45:14 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 26268160BF0 for ; Mon, 12 Jun 2017 18:45:12 +0200 (CEST) Received: (qmail 81994 invoked by uid 500); 12 Jun 2017 16:45:10 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 81671 invoked by uid 99); 12 Jun 2017 16:45:10 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Jun 2017 16:45:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6E3BFE97E0; Mon, 12 Jun 2017 16:45:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ncole@apache.org To: commits@ambari.apache.org Date: Mon, 12 Jun 2017 16:45:29 -0000 Message-Id: <84b2348322c5442ea7be6cb3d1685765@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [22/50] [abbrv] ambari git commit: AMBARI-21054. Add ppc as a new OS for User. (aonishuk) archived-at: Mon, 12 Jun 2017 16:45:14 -0000 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/branch-feature-AMBARI-12556 Commit: e2fbd0f0675d68e54765d83a07a2ea825e2d3821 Parents: d21d434 Author: Andrew Onishuk Authored: Thu Jun 8 15:23:29 2017 +0300 Committer: Andrew Onishuk 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 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); } }