Repository: ambari Updated Branches: refs/heads/trunk e71b06383 -> 1f73cbe50
AMBARI-17485. RU: 'Write Client configs' - step failed (ncole) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1f73cbe5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1f73cbe5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1f73cbe5 Branch: refs/heads/trunk Commit: 1f73cbe50c88195e1cadce2250ef02e22653f3ec Parents: e71b063 Author: Nate Cole <[email protected]> Authored: Wed Jun 29 15:15:32 2016 -0400 Committer: Nate Cole <[email protected]> Committed: Wed Jun 29 15:15:47 2016 -0400 ---------------------------------------------------------------------- .../libraries/script/script.py | 2 +- .../stacks/2.0.6/YARN/test_mapreduce2_client.py | 18 ++++++++++++++++++ .../test/python/stacks/2.1/TEZ/test_tez_client.py | 18 ++++++++++++++++++ .../python/stacks/2.2/SPARK/test_spark_client.py | 18 ++++++++++++++++++ 4 files changed, 55 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/1f73cbe5/ambari-common/src/main/python/resource_management/libraries/script/script.py ---------------------------------------------------------------------- diff --git a/ambari-common/src/main/python/resource_management/libraries/script/script.py b/ambari-common/src/main/python/resource_management/libraries/script/script.py index 77228a9..5deeb52 100644 --- a/ambari-common/src/main/python/resource_management/libraries/script/script.py +++ b/ambari-common/src/main/python/resource_management/libraries/script/script.py @@ -167,7 +167,7 @@ class Script(object): required_attributes = ["stack_name", "stack_root", "version"] for attribute in required_attributes: - if not has_attr(params, attribute): + if not hasattr(params, attribute): raise Fail("Failed in function 'stack_upgrade_save_new_config' because params was missing variable %s." % attribute) Logger.info("stack_upgrade_save_new_config(): Checking if can write new client configs to new config version folder.") http://git-wip-us.apache.org/repos/asf/ambari/blob/1f73cbe5/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_client.py b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_client.py index 0083d75..edd9615 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_client.py +++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_client.py @@ -419,3 +419,21 @@ class TestMapReduce2Client(RMFTestCase): self.assertEquals( ('ambari-python-wrap', '/usr/bin/conf-select', 'create-conf-dir', '--package', 'hadoop', '--stack-version', '2.3.0.0-1234', '--conf-version', '0'), mocks_dict['call'].call_args_list[0][0][0]) + + def test_stack_upgrade_save_new_config(self): + config_file = self.get_src_folder()+"/test/python/stacks/2.0.6/configs/client-upgrade.json" + with open(config_file, "r") as f: + json_content = json.load(f) + version = '2.3.0.0-1234' + json_content['commandParams']['version'] = version + + mocks_dict = {} + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/mapreduce2_client.py", + classname = "MapReduce2Client", + command = "stack_upgrade_save_new_config", + config_dict = json_content, + stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES, + call_mocks = [(0, None, ''), (0, None)], + mocks_dict = mocks_dict) + # for now, it's enough to know the method didn't fail http://git-wip-us.apache.org/repos/asf/ambari/blob/1f73cbe5/ambari-server/src/test/python/stacks/2.1/TEZ/test_tez_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/TEZ/test_tez_client.py b/ambari-server/src/test/python/stacks/2.1/TEZ/test_tez_client.py index 73615a4..e63090a 100644 --- a/ambari-server/src/test/python/stacks/2.1/TEZ/test_tez_client.py +++ b/ambari-server/src/test/python/stacks/2.1/TEZ/test_tez_client.py @@ -126,3 +126,21 @@ class TestTezClient(RMFTestCase): self.assertEquals( ('ambari-python-wrap', '/usr/bin/conf-select', 'create-conf-dir', '--package', 'hadoop', '--stack-version', '2.3.0.0-1234', '--conf-version', '0'), mocks_dict['call'].call_args_list[1][0][0]) + + def test_stack_upgrade_save_new_config(self): + config_file = self.get_src_folder()+"/test/python/stacks/2.1/configs/client-upgrade.json" + with open(config_file, "r") as f: + json_content = json.load(f) + version = '2.3.0.0-1234' + json_content['commandParams']['version'] = version + + mocks_dict = {} + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/tez_client.py", + classname = "TezClient", + command = "stack_upgrade_save_new_config", + config_dict = json_content, + stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES, + call_mocks = [(0, None, ''), (0, None)], + mocks_dict = mocks_dict) + # for now, it's enough to know the method didn't fail \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/1f73cbe5/ambari-server/src/test/python/stacks/2.2/SPARK/test_spark_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/SPARK/test_spark_client.py b/ambari-server/src/test/python/stacks/2.2/SPARK/test_spark_client.py index a8e580a..ed331ea 100644 --- a/ambari-server/src/test/python/stacks/2.2/SPARK/test_spark_client.py +++ b/ambari-server/src/test/python/stacks/2.2/SPARK/test_spark_client.py @@ -181,3 +181,21 @@ class TestSparkClient(RMFTestCase): self.assertEquals( ('ambari-python-wrap', '/usr/bin/conf-select', 'create-conf-dir', '--package', 'spark', '--stack-version', '2.3.0.0-1234', '--conf-version', '0'), mocks_dict['call'].call_args_list[0][0][0]) + + def test_stack_upgrade_save_new_config(self): + config_file = self.get_src_folder()+"/test/python/stacks/2.2/configs/default.json" + with open(config_file, "r") as f: + json_content = json.load(f) + version = '2.3.0.0-1234' + json_content['commandParams']['version'] = version + + mocks_dict = {} + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/spark_client.py", + classname = "SparkClient", + command = "stack_upgrade_save_new_config", + config_dict = json_content, + stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES, + call_mocks = [(0, None, ''), (0, None)], + mocks_dict = mocks_dict) + # for now, it's enough to know the method didn't fail
