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 608C6200CD6 for ; Mon, 31 Jul 2017 16:10:20 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 5F3EE16542E; Mon, 31 Jul 2017 14:10:20 +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 537BE16541C for ; Mon, 31 Jul 2017 16:10:19 +0200 (CEST) Received: (qmail 27185 invoked by uid 500); 31 Jul 2017 14:10:18 -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 26662 invoked by uid 99); 31 Jul 2017 14:10:18 -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, 31 Jul 2017 14:10:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B69F4E0202; Mon, 31 Jul 2017 14:10:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jonathanhurley@apache.org To: commits@ambari.apache.org Date: Mon, 31 Jul 2017 14:10:25 -0000 Message-Id: <75b610d672234bbca0af0d476c32b314@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [10/25] ambari git commit: AMBARI-21582 - Stack Tools and Feature Should be Ignored in Blueprints (part2) (jonathanhurley) archived-at: Mon, 31 Jul 2017 14:10:20 -0000 AMBARI-21582 - Stack Tools and Feature Should be Ignored in Blueprints (part2) (jonathanhurley) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/096d75d7 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/096d75d7 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/096d75d7 Branch: refs/heads/branch-feature-AMBARI-21450 Commit: 096d75d7f96a916155ca1b9466783eda5e5f6416 Parents: 2ed75d7 Author: Jonathan Hurley Authored: Thu Jul 27 10:15:46 2017 -0400 Committer: Jonathan Hurley Committed: Thu Jul 27 10:15:46 2017 -0400 ---------------------------------------------------------------------- .../server/topology/ClusterConfigurationRequestTest.java | 7 +++++++ 1 file changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/096d75d7/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterConfigurationRequestTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterConfigurationRequestTest.java b/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterConfigurationRequestTest.java index 6e47b02..e9445d5 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterConfigurationRequestTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterConfigurationRequestTest.java @@ -57,6 +57,7 @@ import org.easymock.EasyMock; import org.easymock.EasyMockRule; import org.easymock.Mock; import org.easymock.MockType; +import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -110,6 +111,12 @@ public class ClusterConfigurationRequestTest { private final String STACK_NAME = "testStack"; private final String STACK_VERSION = "1"; private final Map> stackProperties = new HashMap<>(); + private final Map defaultClusterEnvProperties = new HashMap<>(); + + @Before + public void setup() { + stackProperties.put(ConfigHelper.CLUSTER_ENV, defaultClusterEnvProperties); + } /** * testConfigType config type should be in updatedConfigTypes, as no custom property in Blueprint