http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py index 0683551..7db4b26 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py +++ b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py @@ -45,7 +45,7 @@ class TestOozieServer(RMFTestCase): classname = "OozieServer", command = "configure", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = call_mocks ) @@ -59,7 +59,7 @@ class TestOozieServer(RMFTestCase): classname = "OozieServer", command = "configure", config_file="default_oozie_mysql.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = call_mocks ) @@ -274,7 +274,7 @@ class TestOozieServer(RMFTestCase): classname = "OozieServer", command = "configure", config_file="oozie_existing_sqla.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = call_mocks ) @@ -496,7 +496,7 @@ class TestOozieServer(RMFTestCase): classname = "OozieServer", command = "start", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = call_mocks ) @@ -551,7 +551,7 @@ class TestOozieServer(RMFTestCase): classname = "OozieServer", command = "stop", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', 'cd /var/tmp/oozie && /usr/lib/oozie/bin/oozie-stop.sh', @@ -571,7 +571,7 @@ class TestOozieServer(RMFTestCase): classname = "OozieServer", command = "configure", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = call_mocks ) @@ -587,7 +587,7 @@ class TestOozieServer(RMFTestCase): classname = "OozieServer", command = "start", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = call_mocks ) @@ -646,7 +646,7 @@ class TestOozieServer(RMFTestCase): classname = "OozieServer", command = "stop", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', 'cd /var/tmp/oozie && /usr/lib/oozie/bin/oozie-stop.sh', @@ -1047,7 +1047,7 @@ class TestOozieServer(RMFTestCase): classname = "OozieServer", command = "configure", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = call_mocks ) @@ -1090,7 +1090,7 @@ class TestOozieServer(RMFTestCase): classname = "OozieServer", command = "security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -1114,7 +1114,7 @@ class TestOozieServer(RMFTestCase): classname = "OozieServer", command = "security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) except: @@ -1131,7 +1131,7 @@ class TestOozieServer(RMFTestCase): classname = "OozieServer", command = "security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) put_structured_out_mock.assert_called_with({"securityIssuesFound": "Keytab file or principal are not set property."}) @@ -1150,7 +1150,7 @@ class TestOozieServer(RMFTestCase): classname = "OozieServer", command = "security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"}) @@ -1160,7 +1160,7 @@ class TestOozieServer(RMFTestCase): classname = "OozieServer", command = "security_status", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"}) @@ -1192,7 +1192,7 @@ class TestOozieServer(RMFTestCase): self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/oozie_server.py", classname = "OozieServer", command = "pre_upgrade_restart", config_file = "oozie-upgrade.json", - hdp_stack_version = self.UPGRADE_STACK_VERSION, + stack_version = self.UPGRADE_STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, prepare_war_stdout)]) @@ -1263,7 +1263,7 @@ class TestOozieServer(RMFTestCase): mocks_dict = {} self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/oozie_server.py", classname = "OozieServer", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.UPGRADE_STACK_VERSION, + stack_version = self.UPGRADE_STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, prepare_war_stdout)], mocks_dict = mocks_dict) @@ -1334,7 +1334,7 @@ class TestOozieServer(RMFTestCase): self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/oozie_server.py", classname = "OozieServer", command = "pre_upgrade_restart", config_file = "oozie-downgrade.json", - hdp_stack_version = self.UPGRADE_STACK_VERSION, + stack_version = self.UPGRADE_STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, prepare_war_stdout)]) @@ -1385,7 +1385,7 @@ class TestOozieServer(RMFTestCase): self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/oozie_server_upgrade.py", classname = "OozieUpgrade", command = "upgrade_oozie_database_and_sharelib", config_dict = json_content, - hdp_stack_version = self.UPGRADE_STACK_VERSION, + stack_version = self.UPGRADE_STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', '/usr/hdp/2.3.0.0-1234/oozie/bin/ooziedb.sh upgrade -run', @@ -1448,7 +1448,7 @@ class TestOozieServer(RMFTestCase): self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/oozie_server_upgrade.py", classname = "OozieUpgrade", command = "upgrade_oozie_database_and_sharelib", config_dict = json_content, - hdp_stack_version = self.UPGRADE_STACK_VERSION, + stack_version = self.UPGRADE_STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('File', '/tmp/mysql-connector-java.jar', @@ -1534,7 +1534,7 @@ class TestOozieServer(RMFTestCase): mocks_dict = {} self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/oozie_server.py", classname = "OozieServer", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.UPGRADE_STACK_VERSION, + stack_version = self.UPGRADE_STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, prepare_war_stdout)], mocks_dict = mocks_dict)
http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_service_check.py b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_service_check.py index 8bf2790..646f5db 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_service_check.py +++ b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_service_check.py @@ -44,7 +44,7 @@ class TestOozieServiceCheck(RMFTestCase): classname = "OozieServiceCheck", command = "service_check", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None), (0, None)], mocks_dict = mocks_dict) http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_service_check.py b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_service_check.py index dc35612..462c361 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_service_check.py +++ b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_service_check.py @@ -32,7 +32,7 @@ class TestServiceCheck(RMFTestCase): classname="OozieServiceCheck", command="service_check", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -53,7 +53,7 @@ class TestServiceCheck(RMFTestCase): classname="OozieServiceCheck", command="service_check", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_client.py b/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_client.py index 99b795e..804abe7 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_client.py +++ b/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_client.py @@ -30,7 +30,7 @@ class TestPigClient(RMFTestCase): classname = "PigClient", command = "configure", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -65,7 +65,7 @@ class TestPigClient(RMFTestCase): classname = "PigClient", command = "configure", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -105,7 +105,7 @@ class TestPigClient(RMFTestCase): classname = "PigClient", command = "configure", config_dict=default_json, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -143,7 +143,7 @@ class TestPigClient(RMFTestCase): classname = "PigClient", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hadoop-client', version), sudo=True) @@ -161,7 +161,7 @@ class TestPigClient(RMFTestCase): classname = "PigClient", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None, '')], mocks_dict = mocks_dict) http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_service_check.py b/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_service_check.py index 9c0b035..1187e97 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_service_check.py +++ b/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_service_check.py @@ -29,7 +29,7 @@ class TestPigServiceCheck(RMFTestCase): classname = "PigServiceCheck", command = "service_check", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('HdfsResource', '/user/ambari-qa/pigsmoke.out', @@ -102,7 +102,7 @@ class TestPigServiceCheck(RMFTestCase): classname = "PigServiceCheck", command = "service_check", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/test/python/stacks/2.0.6/SQOOP/test_service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/SQOOP/test_service_check.py b/ambari-server/src/test/python/stacks/2.0.6/SQOOP/test_service_check.py index 7a13ede..4337f35 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/SQOOP/test_service_check.py +++ b/ambari-server/src/test/python/stacks/2.0.6/SQOOP/test_service_check.py @@ -30,7 +30,7 @@ class TestSqoopServiceCheck(RMFTestCase): classname = "SqoopServiceCheck", command = "service_check", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) kinit_path_local = get_kinit_path() @@ -48,7 +48,7 @@ class TestSqoopServiceCheck(RMFTestCase): classname = "SqoopServiceCheck", command = "service_check", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', 'sqoop version', http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/test/python/stacks/2.0.6/SQOOP/test_sqoop.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/SQOOP/test_sqoop.py b/ambari-server/src/test/python/stacks/2.0.6/SQOOP/test_sqoop.py index e12db4d..040dacb 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/SQOOP/test_sqoop.py +++ b/ambari-server/src/test/python/stacks/2.0.6/SQOOP/test_sqoop.py @@ -30,7 +30,7 @@ class TestSqoop(RMFTestCase): classname = "SqoopClient", command = "configure", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Link', '/usr/lib/sqoop/lib/mysql-connector-java.jar', @@ -76,7 +76,7 @@ class TestSqoop(RMFTestCase): classname = "SqoopClient", command = "configure", config_dict = loaded_json, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Link', '/usr/lib/sqoop/lib/mysql-connector-java.jar', @@ -136,7 +136,7 @@ class TestSqoop(RMFTestCase): classname = "SqoopClient", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None)], mocks_dict = mocks_dict) http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py index 69e1f5d..85959aa 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py +++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py @@ -39,7 +39,7 @@ class TestHistoryServer(RMFTestCase): classname="HistoryServer", command="configure", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_default() @@ -50,7 +50,7 @@ class TestHistoryServer(RMFTestCase): classname="HistoryServer", command="start", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_default() @@ -128,7 +128,7 @@ class TestHistoryServer(RMFTestCase): classname="HistoryServer", command="stop", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -144,7 +144,7 @@ class TestHistoryServer(RMFTestCase): classname="HistoryServer", command="configure", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_secured() @@ -155,7 +155,7 @@ class TestHistoryServer(RMFTestCase): classname="HistoryServer", command="start", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -183,7 +183,7 @@ class TestHistoryServer(RMFTestCase): classname="HistoryServer", command="stop", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -718,7 +718,7 @@ class TestHistoryServer(RMFTestCase): classname="HistoryServer", command="security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -750,7 +750,7 @@ class TestHistoryServer(RMFTestCase): classname="HistoryServer", command="security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) except: @@ -767,7 +767,7 @@ class TestHistoryServer(RMFTestCase): classname="HistoryServer", command="security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) put_structured_out_mock.assert_called_with({"securityIssuesFound": "Keytab file or principal not set."}) @@ -784,7 +784,7 @@ class TestHistoryServer(RMFTestCase): classname="HistoryServer", command="security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"}) @@ -794,7 +794,7 @@ class TestHistoryServer(RMFTestCase): classname="HistoryServer", command="security_status", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"}) @@ -808,8 +808,8 @@ class TestHistoryServer(RMFTestCase): action = ["delete"]) self.assertResourceCalled("Link", "/etc/hadoop/conf", to="/usr/hdp/current/hadoop-client/conf") - @patch.object(Script, "is_hdp_stack_greater_or_equal", new = MagicMock(return_value="2.3.0")) - @patch.object(functions, "get_hdp_version", new = MagicMock(return_value="2.3.0.0-1234")) + @patch.object(Script, "is_stack_greater_or_equal", new = MagicMock(return_value="2.3.0")) + @patch.object(functions, "get_stack_version", new = MagicMock(return_value="2.3.0.0-1234")) @patch("resource_management.libraries.functions.copy_tarball.copy_to_hdfs") def test_pre_upgrade_restart_23(self, copy_to_hdfs_mock): config_file = self.get_src_folder()+"/test/python/stacks/2.0.6/configs/default.json" @@ -824,7 +824,7 @@ class TestHistoryServer(RMFTestCase): classname = "HistoryServer", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None, None), (0, None, None), (0, None, None), (0, None, None)], mocks_dict = mocks_dict) http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/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 a66d829..efe6038 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 @@ -29,7 +29,7 @@ origin_exists = os.path.exists @patch.object(os.path, "exists", new=MagicMock( side_effect=lambda *args: origin_exists(args[0]) if args[0][-2:] == "j2" else True)) -@patch.object(functions, "get_hdp_version", new = MagicMock(return_value="2.2.0.0-1234")) +@patch.object(functions, "get_stack_version", new = MagicMock(return_value="2.2.0.0-1234")) class TestMapReduce2Client(RMFTestCase): COMMON_SERVICES_PACKAGE_DIR = "YARN/2.1.0.2.0/package" STACK_VERSION = "2.0.6" @@ -39,7 +39,7 @@ class TestMapReduce2Client(RMFTestCase): classname = "MapReduce2Client", command = "configure", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -207,7 +207,7 @@ class TestMapReduce2Client(RMFTestCase): classname = "MapReduce2Client", command = "configure", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Directory', '/var/run/hadoop-yarn', @@ -375,13 +375,13 @@ class TestMapReduce2Client(RMFTestCase): ) self.assertNoMoreResources() - @patch.object(functions, "get_hdp_version", new=MagicMock(return_value="2.2.0.0-2041")) + @patch.object(functions, "get_stack_version", new=MagicMock(return_value="2.2.0.0-2041")) def test_upgrade(self): self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/mapreduce2_client.py", classname = "MapReduce2Client", command = "restart", config_file="client-upgrade.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -401,7 +401,7 @@ class TestMapReduce2Client(RMFTestCase): classname = "MapReduce2Client", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None)], mocks_dict = mocks_dict) http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_service_check.py b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_service_check.py index 3618ab8..82ad240 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_service_check.py +++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_service_check.py @@ -36,7 +36,7 @@ class TestServiceCheck(RMFTestCase): classname="MapReduce2ServiceCheck", command="service_check", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('HdfsResource', '/user/ambari-qa/mapredsmokeoutput', @@ -93,7 +93,7 @@ class TestServiceCheck(RMFTestCase): classname="MapReduce2ServiceCheck", command="service_check", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('HdfsResource', '/user/ambari-qa/mapredsmokeoutput', http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_nodemanager.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_nodemanager.py b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_nodemanager.py index d9f0d2e..e1036c5 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_nodemanager.py +++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_nodemanager.py @@ -39,7 +39,7 @@ class TestNodeManager(RMFTestCase): classname="Nodemanager", command="configure", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_default() @@ -50,7 +50,7 @@ class TestNodeManager(RMFTestCase): classname="Nodemanager", command="start", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_default() @@ -77,7 +77,7 @@ class TestNodeManager(RMFTestCase): classname="Nodemanager", command="stop", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', 'export HADOOP_LIBEXEC_DIR=/usr/lib/hadoop/libexec && /usr/lib/hadoop-yarn/sbin/yarn-daemon.sh --config /etc/hadoop/conf stop nodemanager', @@ -90,7 +90,7 @@ class TestNodeManager(RMFTestCase): classname="Nodemanager", command="configure", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_secured() @@ -101,7 +101,7 @@ class TestNodeManager(RMFTestCase): classname="Nodemanager", command="start", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -129,7 +129,7 @@ class TestNodeManager(RMFTestCase): classname="Nodemanager", command="stop", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', 'export HADOOP_LIBEXEC_DIR=/usr/lib/hadoop/libexec && /usr/lib/hadoop-yarn/sbin/yarn-daemon.sh --config /etc/hadoop/conf stop nodemanager', @@ -523,7 +523,7 @@ class TestNodeManager(RMFTestCase): @patch("socket.gethostbyname") @patch('time.sleep') - @patch.object(resource_management.libraries.functions, "get_hdp_version", new = MagicMock(return_value='2.3.0.0-1234')) + @patch.object(resource_management.libraries.functions, "get_stack_version", new = MagicMock(return_value='2.3.0.0-1234')) def test_post_upgrade_restart(self, time_mock, socket_gethostbyname_mock): process_output = """ c6401.ambari.apache.org:45454 RUNNING c6401.ambari.apache.org:8042 0 @@ -535,7 +535,7 @@ class TestNodeManager(RMFTestCase): classname = "Nodemanager", command = "post_upgrade_restart", config_file = "default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, process_output)], mocks_dict = mocks_dict @@ -563,7 +563,7 @@ class TestNodeManager(RMFTestCase): classname="Nodemanager", command = "post_upgrade_restart", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, process_output)], mocks_dict = mocks_dict, @@ -586,7 +586,7 @@ class TestNodeManager(RMFTestCase): classname="Nodemanager", command = "post_upgrade_restart", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(999, process_output)], mocks_dict = mocks_dict, @@ -630,7 +630,7 @@ class TestNodeManager(RMFTestCase): classname="Nodemanager", command="security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -653,7 +653,7 @@ class TestNodeManager(RMFTestCase): classname="Nodemanager", command="security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) except: @@ -670,7 +670,7 @@ class TestNodeManager(RMFTestCase): classname="Nodemanager", command="security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) put_structured_out_mock.assert_called_with({"securityIssuesFound": "Keytab file or principal are not set property."}) @@ -689,7 +689,7 @@ class TestNodeManager(RMFTestCase): classname="Nodemanager", command="security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"}) @@ -699,13 +699,13 @@ class TestNodeManager(RMFTestCase): classname="Nodemanager", command="security_status", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"}) - @patch.object(resource_management.libraries.functions, "get_hdp_version", new = MagicMock(return_value='2.3.0.0-1234')) + @patch.object(resource_management.libraries.functions, "get_stack_version", new = MagicMock(return_value='2.3.0.0-1234')) def test_pre_upgrade_restart_23(self): config_file = self.get_src_folder()+"/test/python/stacks/2.0.6/configs/default.json" with open(config_file, "r") as f: @@ -718,7 +718,7 @@ class TestNodeManager(RMFTestCase): classname = "Nodemanager", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None)], mocks_dict = mocks_dict) http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py index ee6cd3a..e372667 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py +++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py @@ -31,8 +31,8 @@ origin_exists = os.path.exists side_effect=lambda *args: origin_exists(args[0]) if args[0][-2:] == "j2" else True)) -@patch.object(Script, "is_hdp_stack_greater_or_equal", new = MagicMock(return_value=False)) -@patch.object(functions, "get_hdp_version", new = MagicMock(return_value="2.0.0.0-1234")) +@patch.object(Script, "is_stack_greater_or_equal", new = MagicMock(return_value=False)) +@patch.object(functions, "get_stack_version", new = MagicMock(return_value="2.0.0.0-1234")) class TestResourceManager(RMFTestCase): COMMON_SERVICES_PACKAGE_DIR = "YARN/2.1.0.2.0/package" STACK_VERSION = "2.0.6" @@ -42,7 +42,7 @@ class TestResourceManager(RMFTestCase): classname="Resourcemanager", command="configure", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_default() @@ -53,7 +53,7 @@ class TestResourceManager(RMFTestCase): classname="Resourcemanager", command="start", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -79,7 +79,7 @@ class TestResourceManager(RMFTestCase): classname="Resourcemanager", command="stop", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -93,7 +93,7 @@ class TestResourceManager(RMFTestCase): classname="Resourcemanager", command="configure", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_secured() @@ -103,7 +103,7 @@ class TestResourceManager(RMFTestCase): classname="Resourcemanager", command="start", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -130,7 +130,7 @@ class TestResourceManager(RMFTestCase): classname="Resourcemanager", command="stop", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -144,7 +144,7 @@ class TestResourceManager(RMFTestCase): classname = "Resourcemanager", command = "decommission", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('File', '/etc/hadoop/conf/yarn.exclude', @@ -163,7 +163,7 @@ class TestResourceManager(RMFTestCase): classname = "Resourcemanager", command = "decommission", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('File', '/etc/hadoop/conf/yarn.exclude', @@ -545,7 +545,7 @@ class TestResourceManager(RMFTestCase): classname="Resourcemanager", command="security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -568,7 +568,7 @@ class TestResourceManager(RMFTestCase): classname="Resourcemanager", command="security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) except: @@ -585,7 +585,7 @@ class TestResourceManager(RMFTestCase): classname="Resourcemanager", command="security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) put_structured_out_mock.assert_called_with({"securityIssuesFound": "Keytab file or principal are not set property."}) @@ -604,7 +604,7 @@ class TestResourceManager(RMFTestCase): classname="Resourcemanager", command="security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"}) @@ -614,7 +614,7 @@ class TestResourceManager(RMFTestCase): classname="Resourcemanager", command="security_status", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"}) @@ -631,7 +631,7 @@ class TestResourceManager(RMFTestCase): classname = "Resourcemanager", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None)], mocks_dict = mocks_dict) http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_client.py b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_client.py index be075bc..4601092 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_client.py +++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_client.py @@ -39,7 +39,7 @@ class TestYarnClient(RMFTestCase): classname = "YarnClient", command = "configure", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -207,7 +207,7 @@ class TestYarnClient(RMFTestCase): classname = "YarnClient", command = "configure", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Directory', '/var/run/hadoop-yarn', @@ -381,7 +381,7 @@ class TestYarnClient(RMFTestCase): command = "restart", config_file="default.json", config_overrides = { 'roleParams' : { "component_category": "CLIENT" } }, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -544,13 +544,13 @@ class TestYarnClient(RMFTestCase): self.assertNoMoreResources() - @patch.object(functions, "get_hdp_version", new=MagicMock(return_value="2.2.0.0-2041")) + @patch.object(functions, "get_stack_version", new=MagicMock(return_value="2.2.0.0-2041")) def test_upgrade(self): self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/yarn_client.py", classname = "YarnClient", command = "restart", config_file="client-upgrade.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -558,7 +558,7 @@ class TestYarnClient(RMFTestCase): # for now, it's enough that hdp-select is confirmed - @patch.object(functions, "get_hdp_version", new = MagicMock(return_value='2.3.0.0-1234')) + @patch.object(functions, "get_stack_version", new = MagicMock(return_value='2.3.0.0-1234')) def test_pre_upgrade_restart_23(self): config_file = self.get_src_folder()+"/test/python/stacks/2.0.6/configs/default.json" with open(config_file, "r") as f: @@ -571,7 +571,7 @@ class TestYarnClient(RMFTestCase): classname = "YarnClient", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None)], mocks_dict = mocks_dict) http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_service_check.py b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_service_check.py index 6279aab..320092d 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_service_check.py +++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_service_check.py @@ -39,7 +39,7 @@ class TestServiceCheck(RMFTestCase): classname="ServiceCheck", command="service_check", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, checked_call_mocks = [(0, "some test text, appTrackingUrl=http:" "//c6402.ambari.apache.org:8088/proxy/application_1429885383763_0001/, some test text")] @@ -57,7 +57,7 @@ class TestServiceCheck(RMFTestCase): classname="ServiceCheck", command="service_check", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, checked_call_mocks = [(0, "some test text, appTrackingUrl=http:" "//c6402.ambari.apache.org:8088/proxy/application_1429885383763_0001/, some test text")] http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_client.py b/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_client.py index 468f48d..c9b7064 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_client.py +++ b/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_client.py @@ -32,7 +32,7 @@ class TestZookeeperClient(RMFTestCase): classname = "ZookeeperClient", command = "configure", config_file = "default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -95,7 +95,7 @@ class TestZookeeperClient(RMFTestCase): classname = "ZookeeperClient", command = "configure", config_file = "secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -170,7 +170,7 @@ class TestZookeeperClient(RMFTestCase): classname = "ZookeeperClient", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'zookeeper-client', version), sudo=True) @@ -191,7 +191,7 @@ class TestZookeeperClient(RMFTestCase): classname = "ZookeeperClient", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None)], mocks_dict = mocks_dict) http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py b/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py index 260cf33..1c20915 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py +++ b/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py @@ -33,7 +33,7 @@ class TestZookeeperServer(RMFTestCase): classname = "ZookeeperServer", command = "configure", config_file = "default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_default() @@ -44,7 +44,7 @@ class TestZookeeperServer(RMFTestCase): classname = "ZookeeperServer", command = "start", config_file = "default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -60,7 +60,7 @@ class TestZookeeperServer(RMFTestCase): classname = "ZookeeperServer", command = "stop", config_file = "default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -75,7 +75,7 @@ class TestZookeeperServer(RMFTestCase): classname = "ZookeeperServer", command = "configure", config_file = "secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_secured() @@ -86,7 +86,7 @@ class TestZookeeperServer(RMFTestCase): classname = "ZookeeperServer", command = "start", config_file = "secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -104,7 +104,7 @@ class TestZookeeperServer(RMFTestCase): classname = "ZookeeperServer", command = "stop", config_file = "secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -271,7 +271,7 @@ class TestZookeeperServer(RMFTestCase): classname = "ZookeeperServer", command = "security_status", config_file = "secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -294,7 +294,7 @@ class TestZookeeperServer(RMFTestCase): classname = "ZookeeperServer", command = "security_status", config_file = "secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) except: @@ -311,7 +311,7 @@ class TestZookeeperServer(RMFTestCase): classname = "ZookeeperServer", command = "security_status", config_file = "secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) put_structured_out_mock.assert_called_with({"securityIssuesFound": "Keytab file or principal are not set property."}) @@ -330,7 +330,7 @@ class TestZookeeperServer(RMFTestCase): classname = "ZookeeperServer", command = "security_status", config_file = "secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"}) @@ -340,7 +340,7 @@ class TestZookeeperServer(RMFTestCase): classname = "ZookeeperServer", command = "security_status", config_file = "default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"}) @@ -356,7 +356,7 @@ class TestZookeeperServer(RMFTestCase): classname = "ZookeeperServer", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'zookeeper-server', version), sudo=True) @@ -377,7 +377,7 @@ class TestZookeeperServer(RMFTestCase): classname = "ZookeeperServer", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None)], mocks_dict = mocks_dict) @@ -412,7 +412,7 @@ class TestZookeeperServer(RMFTestCase): classname = "ZookeeperServer", command = "post_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [ (0, 'Created'), http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_service_check.py b/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_service_check.py index bb6570a..863505b 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_service_check.py +++ b/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_service_check.py @@ -29,7 +29,7 @@ class TestServiceCheck(RMFTestCase): classname = "ZookeeperServiceCheck", command = "service_check", config_file = "default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('File', '/tmp/zkSmoke.out', @@ -52,7 +52,7 @@ class TestServiceCheck(RMFTestCase): classname = "ZookeeperServiceCheck", command = "service_check", config_file = "secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('File', '/tmp/zkSmoke.out', @@ -75,7 +75,7 @@ class TestServiceCheck(RMFTestCase): classname = "ZookeeperServiceCheck", command = "service_check", config_file = "zk-service_check_2.2.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('File', '/tmp/zkSmoke.out', http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/test/python/stacks/2.0.6/hooks/after-INSTALL/test_after_install.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/hooks/after-INSTALL/test_after_install.py b/ambari-server/src/test/python/stacks/2.0.6/hooks/after-INSTALL/test_after_install.py index 0498b3a..daee726 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/hooks/after-INSTALL/test_after_install.py +++ b/ambari-server/src/test/python/stacks/2.0.6/hooks/after-INSTALL/test_after_install.py @@ -519,7 +519,7 @@ class TestHookAfterInstall(RMFTestCase): @patch("resource_management.libraries.functions.conf_select.select") @patch("os.symlink") @patch("shutil.rmtree") - def test_hook_default_hdp_select_specific_version(self, rmtree_mock, symlink_mock, conf_select_select_mock, conf_select_create_mock): + def test_hook_default_stack_select_specific_version(self, rmtree_mock, symlink_mock, conf_select_select_mock, conf_select_create_mock): """ Tests that hdp-select set all on a specific version, not a 2.3* wildcard is used when installing a component when the cluster version is already set. http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py index 4d900eb..fbf624a 100644 --- a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py +++ b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py @@ -32,7 +32,7 @@ class TestFalconClient(RMFTestCase): classname="FalconClient", command="configure", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Directory', '/var/run/falcon', @@ -92,7 +92,7 @@ class TestFalconClient(RMFTestCase): classname="FalconClient", command="security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -103,7 +103,7 @@ class TestFalconClient(RMFTestCase): classname="FalconClient", command="security_status", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -119,7 +119,7 @@ class TestFalconClient(RMFTestCase): classname = "FalconClient", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'falcon-client', version), sudo=True,) @@ -138,7 +138,7 @@ class TestFalconClient(RMFTestCase): classname = "FalconClient", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None)], mocks_dict = mocks_dict) http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py index 10c721f..f6efb8c 100644 --- a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py +++ b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py @@ -37,7 +37,7 @@ class TestFalconServer(RMFTestCase): classname="FalconServer", command="start", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assert_configure_default() @@ -54,7 +54,7 @@ class TestFalconServer(RMFTestCase): classname="FalconServer", command="stop", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Execute', '/usr/lib/falcon/bin/falcon-stop', @@ -72,7 +72,7 @@ class TestFalconServer(RMFTestCase): classname="FalconServer", command="configure", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_default() @@ -201,7 +201,7 @@ class TestFalconServer(RMFTestCase): self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/falcon_server.py", classname = "FalconServer", command = "restart", config_file = "falcon-upgrade.json", - hdp_stack_version = self.UPGRADE_STACK_VERSION, + stack_version = self.UPGRADE_STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', @@ -421,7 +421,7 @@ class TestFalconServer(RMFTestCase): classname="FalconServer", command="security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -445,7 +445,7 @@ class TestFalconServer(RMFTestCase): classname="FalconServer", command="security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) except: @@ -462,7 +462,7 @@ class TestFalconServer(RMFTestCase): classname="FalconServer", command="security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) put_structured_out_mock.assert_called_with({"securityIssuesFound": "Keytab file or principal are not set property."}) @@ -481,7 +481,7 @@ class TestFalconServer(RMFTestCase): classname="FalconServer", command="security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"}) @@ -491,7 +491,7 @@ class TestFalconServer(RMFTestCase): classname="FalconServer", command="security_status", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"}) @@ -509,7 +509,7 @@ class TestFalconServer(RMFTestCase): classname = "FalconServer", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'falcon-server', version), sudo=True,) @@ -554,7 +554,7 @@ class TestFalconServer(RMFTestCase): classname = "FalconServer", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None)], mocks_dict = mocks_dict) http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/test/python/stacks/2.1/FALCON/test_service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/FALCON/test_service_check.py b/ambari-server/src/test/python/stacks/2.1/FALCON/test_service_check.py index bb0ce90..6519e3c 100644 --- a/ambari-server/src/test/python/stacks/2.1/FALCON/test_service_check.py +++ b/ambari-server/src/test/python/stacks/2.1/FALCON/test_service_check.py @@ -30,7 +30,7 @@ class TestFalconServiceCheck(RMFTestCase): classname="FalconServiceCheck", command="service_check", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', '/usr/lib/falcon/bin/falcon admin -version', @@ -44,7 +44,7 @@ class TestFalconServiceCheck(RMFTestCase): classname="FalconServiceCheck", command="service_check", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute','/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab ambari...@example.com', http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py b/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py index 425d060..80e4e36 100644 --- a/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py +++ b/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py @@ -37,7 +37,7 @@ class TestHiveMetastore(RMFTestCase): classname = "HiveMetastore", command = "configure", config_file="../../2.1/configs/default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_default() @@ -47,7 +47,7 @@ class TestHiveMetastore(RMFTestCase): classname = "HiveMetastore", command = "start", config_file="../../2.1/configs/default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -77,7 +77,7 @@ class TestHiveMetastore(RMFTestCase): classname = "HiveMetastore", command = "start", config_file="../../2.1/configs/default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -104,7 +104,7 @@ class TestHiveMetastore(RMFTestCase): classname = "HiveMetastore", command = "stop", config_file="../../2.1/configs/default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -128,7 +128,7 @@ class TestHiveMetastore(RMFTestCase): classname = "HiveMetastore", command = "configure", config_file="../../2.1/configs/secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_secured() @@ -139,7 +139,7 @@ class TestHiveMetastore(RMFTestCase): classname = "HiveMetastore", command = "start", config_file="../../2.1/configs/secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -164,7 +164,7 @@ class TestHiveMetastore(RMFTestCase): classname = "HiveMetastore", command = "stop", config_file="../../2.1/configs/secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -413,7 +413,7 @@ class TestHiveMetastore(RMFTestCase): classname = "HiveMetastore", command = "security_status", config_file="../../2.1/configs/secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -437,7 +437,7 @@ class TestHiveMetastore(RMFTestCase): classname = "HiveMetastore", command = "security_status", config_file="../../2.1/configs/secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) except: @@ -454,7 +454,7 @@ class TestHiveMetastore(RMFTestCase): classname = "HiveMetastore", command = "security_status", config_file="../../2.1/configs/secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) put_structured_out_mock.assert_called_with({"securityIssuesFound": "Keytab file or principal are not set property."}) @@ -473,7 +473,7 @@ class TestHiveMetastore(RMFTestCase): classname = "HiveMetastore", command = "security_status", config_file="../../2.1/configs/secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"}) @@ -483,7 +483,7 @@ class TestHiveMetastore(RMFTestCase): classname = "HiveMetastore", command = "security_status", config_file="../../2.1/configs/default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"}) @@ -498,7 +498,7 @@ class TestHiveMetastore(RMFTestCase): classname = "HiveMetastore", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hive-metastore', version), sudo=True,) @@ -519,7 +519,7 @@ class TestHiveMetastore(RMFTestCase): classname = "HiveMetastore", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None)], mocks_dict = mocks_dict) @@ -551,7 +551,7 @@ class TestHiveMetastore(RMFTestCase): classname = "HiveMetastore", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None)]) @@ -571,7 +571,7 @@ class TestHiveMetastore(RMFTestCase): classname = "HiveMetastore", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None)]) @@ -589,7 +589,7 @@ class TestHiveMetastore(RMFTestCase): classname = "HiveMetastore", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None)]) @@ -598,9 +598,9 @@ class TestHiveMetastore(RMFTestCase): @patch("os.path.exists") @patch("resource_management.core.shell.call") - @patch("resource_management.libraries.functions.get_hdp_version") - def test_upgrade_metastore_schema(self, get_hdp_version_mock, call_mock, os_path_exists_mock): - get_hdp_version_mock.return_value = '2.3.0.0-1234' + @patch("resource_management.libraries.functions.get_stack_version") + def test_upgrade_metastore_schema(self, get_stack_version_mock, call_mock, os_path_exists_mock): + get_stack_version_mock.return_value = '2.3.0.0-1234' def side_effect(path): if path == "/usr/hdp/2.2.7.0-1234/hive-server2/lib/mysql-connector-java.jar": @@ -633,7 +633,7 @@ class TestHiveMetastore(RMFTestCase): classname = "HiveMetastore", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None)], mocks_dict = mocks_dict) @@ -688,9 +688,9 @@ class TestHiveMetastore(RMFTestCase): @patch("os.path.exists") @patch("resource_management.core.shell.call") - @patch("resource_management.libraries.functions.get_hdp_version") - def test_upgrade_metastore_schema_using_new_db(self, get_hdp_version_mock, call_mock, os_path_exists_mock): - get_hdp_version_mock.return_value = '2.3.0.0-1234' + @patch("resource_management.libraries.functions.get_stack_version") + def test_upgrade_metastore_schema_using_new_db(self, get_stack_version_mock, call_mock, os_path_exists_mock): + get_stack_version_mock.return_value = '2.3.0.0-1234' def side_effect(path): if path == "/usr/hdp/2.2.7.0-1234/hive-server2/lib/mysql-connector-java.jar": @@ -713,7 +713,7 @@ class TestHiveMetastore(RMFTestCase): classname = "HiveMetastore", command = "upgrade_schema", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None)], mocks_dict = mocks_dict) @@ -754,10 +754,10 @@ class TestHiveMetastore(RMFTestCase): @patch("os.path.exists") @patch("resource_management.core.shell.call") - @patch("resource_management.libraries.functions.get_hdp_version") - def test_upgrade_sqla_metastore_schema_with_jdbc_download(self, get_hdp_version_mock, call_mock, os_path_exists_mock): + @patch("resource_management.libraries.functions.get_stack_version") + def test_upgrade_sqla_metastore_schema_with_jdbc_download(self, get_stack_version_mock, call_mock, os_path_exists_mock): - get_hdp_version_mock.return_value = '2.3.0.0-1234' + get_stack_version_mock.return_value = '2.3.0.0-1234' def side_effect(path): if path == "/usr/hdp/2.2.7.0-1234/hive-server2/lib/mysql-connector-java.jar": @@ -789,7 +789,7 @@ class TestHiveMetastore(RMFTestCase): classname = "HiveMetastore", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None)], mocks_dict = mocks_dict) http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/test/python/stacks/2.1/STORM/test_service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/STORM/test_service_check.py b/ambari-server/src/test/python/stacks/2.1/STORM/test_service_check.py index 6f2080a..799494b 100644 --- a/ambari-server/src/test/python/stacks/2.1/STORM/test_service_check.py +++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_service_check.py @@ -33,7 +33,7 @@ class TestStormServiceCheck(TestStormBase): classname="ServiceCheck", command="service_check", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES )
