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 F200D200CE5 for ; Sat, 8 Jul 2017 06:06:39 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id F0A1F16A8BD; Sat, 8 Jul 2017 04:06:39 +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 6D97016A8B8 for ; Sat, 8 Jul 2017 06:06:39 +0200 (CEST) Received: (qmail 86265 invoked by uid 500); 8 Jul 2017 04:06:38 -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 86256 invoked by uid 99); 8 Jul 2017 04:06:38 -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; Sat, 08 Jul 2017 04:06:38 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4C4A8F321A; Sat, 8 Jul 2017 04:06:36 +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: Sat, 08 Jul 2017 04:06:36 -0000 Message-Id: <43aa7a8e75114ee9a0ae8a1e5cefcd6e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/9] ambari git commit: AMBARI-21430 - Allow Multiple Versions of Stack Tools to Co-Exist (jonathanhurley) archived-at: Sat, 08 Jul 2017 04:06:40 -0000 Repository: ambari Updated Branches: refs/heads/trunk a795f38cd -> f33a250c0 http://git-wip-us.apache.org/repos/asf/ambari/blob/f33a250c/ambari-server/src/test/python/stacks/utils/RMFTestCase.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/utils/RMFTestCase.py b/ambari-server/src/test/python/stacks/utils/RMFTestCase.py index 282b542..2f3794d 100644 --- a/ambari-server/src/test/python/stacks/utils/RMFTestCase.py +++ b/ambari-server/src/test/python/stacks/utils/RMFTestCase.py @@ -102,8 +102,12 @@ class RMFTestCase(TestCase): else: raise RuntimeError("Please specify either config_file_path or config_dict parameter") - self.config_dict["configurations"]["cluster-env"]["stack_tools"] = RMFTestCase.get_stack_tools() - self.config_dict["configurations"]["cluster-env"]["stack_features"] = RMFTestCase.get_stack_features() + # add the stack tools & features from the stack if the test case's JSON file didn't have them + if "stack_tools" not in self.config_dict["configurations"]["cluster-env"]: + self.config_dict["configurations"]["cluster-env"]["stack_tools"] = RMFTestCase.get_stack_tools() + + if "stack_features" not in self.config_dict["configurations"]["cluster-env"]: + self.config_dict["configurations"]["cluster-env"]["stack_features"] = RMFTestCase.get_stack_features() if config_overrides: for key, value in config_overrides.iteritems():