Repository: ambari Updated Branches: refs/heads/branch-2.1 7ddd8ae2f -> 458dfd71e refs/heads/trunk 64064c3f2 -> c1848637a
AMBARI-12191. RU: zk upgrade fails with non-root agent + umask 027 (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c1848637 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c1848637 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c1848637 Branch: refs/heads/trunk Commit: c1848637a466d15c59f4fae0c8ea9e7202039124 Parents: 64064c3 Author: Andrew Onishuk <[email protected]> Authored: Sun Jun 28 18:49:16 2015 +0300 Committer: Andrew Onishuk <[email protected]> Committed: Sun Jun 28 18:49:16 2015 +0300 ---------------------------------------------------------------------- .../resource_management/libraries/functions/hdp_select.py | 6 +++--- .../HDFS/2.1.0.2.0/package/scripts/namenode_upgrade.py | 2 +- .../src/test/python/stacks/2.0.6/FLUME/test_flume.py | 2 +- .../src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py | 8 ++++---- .../src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py | 4 ++-- .../python/stacks/2.0.6/HBASE/test_hbase_regionserver.py | 4 ++-- .../python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py | 2 +- .../src/test/python/stacks/2.0.6/HDFS/test_datanode.py | 4 ++-- .../src/test/python/stacks/2.0.6/HDFS/test_hdfs_client.py | 6 +++--- .../src/test/python/stacks/2.0.6/HDFS/test_journalnode.py | 4 ++-- .../src/test/python/stacks/2.0.6/HDFS/test_namenode.py | 4 ++-- .../src/test/python/stacks/2.0.6/HIVE/test_hive_client.py | 4 ++-- .../src/test/python/stacks/2.0.6/HIVE/test_hive_server.py | 8 ++++---- .../src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py | 4 ++-- .../src/test/python/stacks/2.0.6/OOZIE/test_oozie_client.py | 4 ++-- .../src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py | 6 +++--- .../src/test/python/stacks/2.0.6/PIG/test_pig_client.py | 4 ++-- .../src/test/python/stacks/2.0.6/SQOOP/test_sqoop.py | 2 +- .../src/test/python/stacks/2.0.6/YARN/test_historyserver.py | 2 +- .../test/python/stacks/2.0.6/YARN/test_mapreduce2_client.py | 4 ++-- .../src/test/python/stacks/2.0.6/YARN/test_nodemanager.py | 2 +- .../test/python/stacks/2.0.6/YARN/test_resourcemanager.py | 2 +- .../src/test/python/stacks/2.0.6/YARN/test_yarn_client.py | 4 ++-- .../python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_client.py | 4 ++-- .../python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py | 4 ++-- .../src/test/python/stacks/2.1/FALCON/test_falcon_client.py | 4 ++-- .../src/test/python/stacks/2.1/FALCON/test_falcon_server.py | 6 +++--- .../src/test/python/stacks/2.1/HIVE/test_hive_metastore.py | 6 +++--- .../test/python/stacks/2.1/STORM/test_storm_drpc_server.py | 4 ++-- .../src/test/python/stacks/2.1/STORM/test_storm_nimbus.py | 8 ++++---- .../test/python/stacks/2.1/STORM/test_storm_nimbus_prod.py | 8 ++++---- .../python/stacks/2.1/STORM/test_storm_rest_api_service.py | 4 ++-- .../test/python/stacks/2.1/STORM/test_storm_supervisor.py | 8 ++++---- .../python/stacks/2.1/STORM/test_storm_supervisor_prod.py | 8 ++++---- .../src/test/python/stacks/2.1/STORM/test_storm_ui_server.py | 4 ++-- .../src/test/python/stacks/2.1/TEZ/test_tez_client.py | 6 +++--- .../test/python/stacks/2.1/YARN/test_apptimelineserver.py | 2 +- .../test/python/stacks/2.2/ACCUMULO/test_accumulo_client.py | 4 ++-- .../src/test/python/stacks/2.2/KAFKA/test_kafka_broker.py | 4 ++-- .../src/test/python/stacks/2.2/KNOX/test_knox_gateway.py | 4 ++-- .../src/test/python/stacks/2.2/RANGER/test_ranger_admin.py | 2 +- .../test/python/stacks/2.2/RANGER/test_ranger_usersync.py | 4 ++-- .../src/test/python/stacks/2.2/SLIDER/test_slider_client.py | 8 ++++---- .../test/python/stacks/2.2/SPARK/test_job_history_server.py | 2 +- .../src/test/python/stacks/2.2/SPARK/test_spark_client.py | 2 +- .../src/test/python/stacks/2.3/MAHOUT/test_mahout_client.py | 4 ++-- 46 files changed, 101 insertions(+), 101 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/c1848637/ambari-common/src/main/python/resource_management/libraries/functions/hdp_select.py ---------------------------------------------------------------------- diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/hdp_select.py b/ambari-common/src/main/python/resource_management/libraries/functions/hdp_select.py index f3b9b38..408c593 100644 --- a/ambari-common/src/main/python/resource_management/libraries/functions/hdp_select.py +++ b/ambari-common/src/main/python/resource_management/libraries/functions/hdp_select.py @@ -27,7 +27,7 @@ from resource_management.libraries.functions.get_hdp_version import get_hdp_vers from resource_management.libraries.script.script import Script # hdp-select set oozie-server 2.2.0.0-1234 -TEMPLATE = "hdp-select set {0} {1}" +TEMPLATE = ('hdp-select', 'set') # a mapping of Ambari server role to hdp-select component name for all # non-clients @@ -103,8 +103,8 @@ def select(component, version): :param component: the hdp-select component, such as oozie-server :param version: the version to set the component to, such as 2.2.0.0-1234 """ - command = TEMPLATE.format(component, version) - Execute(command) + command = TEMPLATE + (component, version) + Execute(command, sudo=True) # don't trust the ordering of modules: # 1) status_params http://git-wip-us.apache.org/repos/asf/ambari/blob/c1848637/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode_upgrade.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode_upgrade.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode_upgrade.py index 59fef7d..fb39878 100644 --- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode_upgrade.py +++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode_upgrade.py @@ -67,7 +67,7 @@ def reach_safemode_state(user, safemode_state, in_ha): logoutput=True, path=[params.hadoop_bin_dir]) - code, out = call(safemode_check_with_grep, user=user) + code, out = shell.call(safemode_check_with_grep, user=user) Logger.info("Command: %s\nCode: %d. Out: %s" % (safemode_check_with_grep, code, out)) if code == 0: return (True, original_state) http://git-wip-us.apache.org/repos/asf/ambari/blob/c1848637/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py b/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py index 9a53af4..8143005 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py +++ b/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py @@ -485,7 +485,7 @@ class TestFlumeHandler(RMFTestCase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) - self.assertResourceCalled("Execute", "hdp-select set flume-server 2.2.1.0-2067") + self.assertResourceCalled("Execute", ('hdp-select', 'set', 'flume-server', '2.2.1.0-2067'), sudo=True) def build_flume(content): http://git-wip-us.apache.org/repos/asf/ambari/blob/c1848637/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py index aaeaf2d..7deb6dd 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py @@ -200,8 +200,8 @@ class TestHBaseClient(RMFTestCase): target = RMFTestCase.TARGET_COMMON_SERVICES, mocks_dict = mocks_dict) - self.assertResourceCalled("Execute", "hdp-select set hbase-client 2.2.1.0-2067") - self.assertResourceCalled("Execute", "hdp-select set hadoop-client 2.2.1.0-2067") + self.assertResourceCalled("Execute", ('hdp-select', 'set', 'hbase-client', '2.2.1.0-2067'), sudo=True) + self.assertResourceCalled("Execute", ('hdp-select', 'set', 'hadoop-client', '2.2.1.0-2067'), sudo=True) self.assertEquals(1, mocks_dict['call'].call_count) @@ -225,8 +225,8 @@ class TestHBaseClient(RMFTestCase): call_mocks = [(0, None), (0, None), (0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled('Execute', 'hdp-select set hbase-client %s' % version) - self.assertResourceCalled('Execute', 'hdp-select set hadoop-client %s' % version) + self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hbase-client', version), sudo=True) + self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hadoop-client', version), sudo=True) self.assertEquals(5, mocks_dict['call'].call_count) self.assertEquals( http://git-wip-us.apache.org/repos/asf/ambari/blob/c1848637/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py index cb4fd44..fe1cf21 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py @@ -693,7 +693,7 @@ class TestHBaseMaster(RMFTestCase): target = RMFTestCase.TARGET_COMMON_SERVICES, mocks_dict = mocks_dict) self.assertResourceCalled('Execute', - 'hdp-select set hbase-master %s' % version,) + ('hdp-select', 'set', 'hbase-master', version), sudo=True,) self.assertFalse(call_mock.called) self.assertNoMoreResources() @@ -717,7 +717,7 @@ class TestHBaseMaster(RMFTestCase): call_mocks = [(0, None), (0, None), (0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled('Execute', 'hdp-select set hbase-master %s' % version) + self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hbase-master', version), sudo=True) self.assertEquals(2, mocks_dict['call'].call_count) self.assertEquals( http://git-wip-us.apache.org/repos/asf/ambari/blob/c1848637/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py index 11247e7..65167a7 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py @@ -487,7 +487,7 @@ class TestHbaseRegionServer(RMFTestCase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Execute', - 'hdp-select set hbase-regionserver %s' % version,) + ('hdp-select', 'set', 'hbase-regionserver', version), sudo=True,) self.assertNoMoreResources() @@ -529,7 +529,7 @@ class TestHbaseRegionServer(RMFTestCase): call_mocks = [(0, None), (0, None), (0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled('Execute', 'hdp-select set hbase-regionserver %s' % version) + self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hbase-regionserver', version), sudo=True) self.assertEquals(2, mocks_dict['call'].call_count) self.assertEquals( http://git-wip-us.apache.org/repos/asf/ambari/blob/c1848637/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py index c0a1686..2522925 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py @@ -401,6 +401,6 @@ class TestPhoenixQueryServer(RMFTestCase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) - self.assertResourceCalled('Execute', 'hdp-select set phoenix-server 2.3.0.0-1234') + self.assertResourceCalled('Execute', ('hdp-select', 'set', 'phoenix-server', '2.3.0.0-1234'), sudo=True) self.assertNoMoreResources() \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/c1848637/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py index 7ee2126..1ae9ec6 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py @@ -435,7 +435,7 @@ class TestDatanode(RMFTestCase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Execute', - 'hdp-select set hadoop-hdfs-datanode %s' % version,) + ('hdp-select', 'set', 'hadoop-hdfs-datanode', version), sudo=True,) self.assertNoMoreResources() @@ -456,7 +456,7 @@ class TestDatanode(RMFTestCase): target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled('Execute', 'hdp-select set hadoop-hdfs-datanode %s' % version,) + self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hadoop-hdfs-datanode', version), sudo=True,) self.assertNoMoreResources() http://git-wip-us.apache.org/repos/asf/ambari/blob/c1848637/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_hdfs_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_hdfs_client.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_hdfs_client.py index 0f5b956..502c3bb 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_hdfs_client.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_hdfs_client.py @@ -77,7 +77,7 @@ class Test(RMFTestCase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) - self.assertResourceCalled("Execute", "hdp-select set hadoop-client 2.2.1.0-2067") + self.assertResourceCalled("Execute", ('hdp-select', 'set', 'hadoop-client', '2.2.1.0-2067'), sudo=True) # for now, it's enough that hdp-select is confirmed @@ -199,7 +199,7 @@ class Test(RMFTestCase): call_mocks = [(0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled('Execute', 'hdp-select set hadoop-client %s' % version,) + self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hadoop-client', version), sudo=True,) self.assertNoMoreResources() self.assertEquals(2, mocks_dict['call'].call_count) @@ -222,5 +222,5 @@ class Test(RMFTestCase): config_dict = json_content, hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) - self.assertResourceCalled('Execute', 'hdp-select set hadoop-client %s' % version,) + self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hadoop-client', version), sudo=True,) self.assertNoMoreResources() http://git-wip-us.apache.org/repos/asf/ambari/blob/c1848637/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py index ba09c73..2e45f59 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py @@ -464,7 +464,7 @@ class TestJournalnode(RMFTestCase): config_dict = json_content, hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) - self.assertResourceCalled('Execute', 'hdp-select set hadoop-hdfs-journalnode %s' % version,) + self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hadoop-hdfs-journalnode', version), sudo=True,) self.assertNoMoreResources() @patch("resource_management.core.shell.call") @@ -485,7 +485,7 @@ class TestJournalnode(RMFTestCase): call_mocks = [(0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled('Execute', 'hdp-select set hadoop-hdfs-journalnode %s' % version,) + self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hadoop-hdfs-journalnode', version), sudo=True,) self.assertNoMoreResources() self.assertEquals( http://git-wip-us.apache.org/repos/asf/ambari/blob/c1848637/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py index efe9881..00b0e57 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py @@ -1160,7 +1160,7 @@ class TestNamenode(RMFTestCase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Execute', - 'hdp-select set hadoop-hdfs-namenode %s' % version) + ('hdp-select', 'set', 'hadoop-hdfs-namenode', version), sudo=True) self.assertNoMoreResources() @patch("resource_management.core.shell.call") @@ -1180,7 +1180,7 @@ class TestNamenode(RMFTestCase): target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled('Execute', 'hdp-select set hadoop-hdfs-namenode %s' % version) + self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hadoop-hdfs-namenode', version), sudo=True) self.assertNoMoreResources() self.assertEquals(2, mocks_dict['call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/c1848637/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_client.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_client.py index 7e1fcca..ded432b 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_client.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_client.py @@ -188,7 +188,7 @@ class TestHiveClient(RMFTestCase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Execute', - 'hdp-select set hadoop-client %s' % version,) + ('hdp-select', 'set', 'hadoop-client', version), sudo=True,) self.assertNoMoreResources() @patch("resource_management.core.shell.call") @@ -210,7 +210,7 @@ class TestHiveClient(RMFTestCase): mocks_dict = mocks_dict) self.assertResourceCalled('Execute', - 'hdp-select set hadoop-client %s' % version,) + ('hdp-select', 'set', 'hadoop-client', version), sudo=True,) self.assertNoMoreResources() self.assertEquals(2, mocks_dict['call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/c1848637/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py index 4ae750f..ae03d5a 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py @@ -692,7 +692,7 @@ class TestHiveServer(RMFTestCase): path=['/bin:/usr/hdp/current/hive-server2/bin:/usr/hdp/current/hadoop-client/bin'], tries=1, user='hive') - self.assertResourceCalled('Execute', 'hdp-select set hive-server2 2.2.1.0-2065',) + self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hive-server2', '2.2.1.0-2065'), sudo=True,) @patch("resource_management.libraries.functions.copy_tarball.copy_to_hdfs") @patch.object(Script, "is_hdp_stack_greater_or_equal", new = MagicMock(return_value=True)) @@ -712,7 +712,7 @@ class TestHiveServer(RMFTestCase): path=['/bin:/usr/hdp/current/hive-server2/bin:/usr/hdp/current/hadoop-client/bin'], tries=1, user='hive') - self.assertResourceCalled('Execute', 'hdp-select set hive-server2 2.2.1.0-2065',) + self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hive-server2', '2.2.1.0-2065'), sudo=True,) def test_stop_during_upgrade_bad_hive_version(self): try: @@ -857,7 +857,7 @@ class TestHiveServer(RMFTestCase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Execute', - 'hdp-select set hive-server2 %s' % version,) + ('hdp-select', 'set', 'hive-server2', version), sudo=True,) copy_to_hdfs_mock.assert_any_call("mapreduce", "hadoop", "hdfs") copy_to_hdfs_mock.assert_any_call("tez", "hadoop", "hdfs") @@ -896,7 +896,7 @@ class TestHiveServer(RMFTestCase): self.assertResourceCalled('Execute', - 'hdp-select set hive-server2 %s' % version,) + ('hdp-select', 'set', 'hive-server2', version), sudo=True,) copy_to_hdfs_mock.assert_any_call("mapreduce", "hadoop", "hdfs") copy_to_hdfs_mock.assert_any_call("tez", "hadoop", "hdfs") self.assertEquals(2, copy_to_hdfs_mock.call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/c1848637/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py index c2ac340..fd91ed3 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py @@ -335,7 +335,7 @@ class TestWebHCatServer(RMFTestCase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Execute', - 'hdp-select set hive-webhcat %s' % version,) + ('hdp-select', 'set', 'hive-webhcat', version), sudo=True,) self.assertNoMoreResources() @patch("resource_management.core.shell.call") @@ -357,7 +357,7 @@ class TestWebHCatServer(RMFTestCase): mocks_dict = mocks_dict) self.assertResourceCalled('Execute', - 'hdp-select set hive-webhcat %s' % version,) + ('hdp-select', 'set', 'hive-webhcat', version), sudo=True,) self.assertNoMoreResources() self.assertEquals(2, mocks_dict['call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/c1848637/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_client.py b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_client.py index 1312239..0ee81d4 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_client.py +++ b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_client.py @@ -208,7 +208,7 @@ class TestOozieClient(RMFTestCase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Execute', - 'hdp-select set oozie-client %s' % version) + ('hdp-select', 'set', 'oozie-client', version), sudo=True) self.assertNoMoreResources() @@ -231,7 +231,7 @@ class TestOozieClient(RMFTestCase): mocks_dict = mocks_dict) self.assertResourceCalled('Execute', - 'hdp-select set oozie-client %s' % version) + ('hdp-select', 'set', 'oozie-client', version), sudo=True) self.assertNoMoreResources() self.assertEquals(2, mocks_dict['call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/c1848637/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 90d8098..b92f6fa 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 @@ -949,7 +949,7 @@ class TestOozieServer(RMFTestCase): self.assertEqual(glob_mock.call_count,1) glob_mock.assert_called_with('/usr/hdp/2.2.1.0-2135/hadoop/lib/hadoop-lzo*.jar') - self.assertResourceCalled('Execute', 'hdp-select set oozie-server 2.2.1.0-2135',) + self.assertResourceCalled('Execute', ('hdp-select', 'set', 'oozie-server', '2.2.1.0-2135'), sudo=True,) self.assertResourceCalled('HdfsResource', '/user/oozie/share', security_enabled = False, hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin', @@ -1036,7 +1036,7 @@ class TestOozieServer(RMFTestCase): self.assertEqual(glob_mock.call_count,1) glob_mock.assert_called_with('/usr/hdp/2.3.0.0-1234/hadoop/lib/hadoop-lzo*.jar') - self.assertResourceCalled('Execute', 'hdp-select set oozie-server 2.3.0.0-1234') + self.assertResourceCalled('Execute', ('hdp-select', 'set', 'oozie-server', '2.3.0.0-1234'), sudo=True) self.assertResourceCalled('HdfsResource', '/user/oozie/share', security_enabled = False, hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin', @@ -1118,7 +1118,7 @@ class TestOozieServer(RMFTestCase): self.assertEqual(isfile_mock.call_count,2) isfile_mock.assert_called_with('/usr/share/HDP-oozie/ext-2.2.zip') - self.assertResourceCalled('Execute', 'hdp-select set oozie-server 2.2.0.0-0000') + self.assertResourceCalled('Execute', ('hdp-select', 'set', 'oozie-server', '2.2.0.0-0000'), sudo=True) self.assertResourceCalled('HdfsResource', '/user/oozie/share', security_enabled = False, hadoop_bin_dir = '/usr/hdp/2.2.0.0-0000/hadoop/bin', http://git-wip-us.apache.org/repos/asf/ambari/blob/c1848637/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 ff6cc34..ef098b0 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 @@ -146,7 +146,7 @@ class TestPigClient(RMFTestCase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Execute', - 'hdp-select set hadoop-client %s' % version) + ('hdp-select', 'set', 'hadoop-client', version), sudo=True) self.assertNoMoreResources() def test_pre_rolling_restart_23(self): @@ -167,7 +167,7 @@ class TestPigClient(RMFTestCase): mocks_dict = mocks_dict) self.assertResourceCalled('Execute', - 'hdp-select set hadoop-client %s' % version) + ('hdp-select', 'set', 'hadoop-client', version), sudo=True) self.assertNoMoreResources() self.assertEquals(2, mocks_dict['call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/c1848637/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 4a17d63..de1b483 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 @@ -129,7 +129,7 @@ class TestSqoop(RMFTestCase): call_mocks = [(0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled("Execute", "hdp-select set sqoop-client %s" % version) + self.assertResourceCalled("Execute", ('hdp-select', 'set', 'sqoop-client', version), sudo=True) self.assertEquals(2, mocks_dict['call'].call_count) self.assertEquals( http://git-wip-us.apache.org/repos/asf/ambari/blob/c1848637/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 33f4956..7d8673f 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 @@ -754,7 +754,7 @@ class TestHistoryServer(RMFTestCase): call_mocks = [(0, None), (0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled('Execute', 'hdp-select set hadoop-mapreduce-historyserver %s' % version) + self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hadoop-mapreduce-historyserver', version), sudo=True) copy_to_hdfs_mock.assert_called_with("tez", "hadoop", "hdfs") self.assertResourceCalled('HdfsResource', None, http://git-wip-us.apache.org/repos/asf/ambari/blob/c1848637/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 d0cf44c..b1c691a 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 @@ -384,7 +384,7 @@ class TestMapReduce2Client(RMFTestCase): ) # for now, it's enough that hdp-select is confirmed - self.assertResourceCalled("Execute", "hdp-select set hadoop-client 2.2.1.0-2067") + self.assertResourceCalled("Execute", ('hdp-select', 'set', 'hadoop-client', '2.2.1.0-2067'), sudo=True) def test_pre_rolling_restart_23(self): @@ -404,7 +404,7 @@ class TestMapReduce2Client(RMFTestCase): call_mocks = [(0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled('Execute', 'hdp-select set hadoop-client {0}'.format(version)) + self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hadoop-client', version), sudo=True) self.assertNoMoreResources() self.assertEquals(2, mocks_dict['call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/c1848637/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 7be252e..e9b44e8 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 @@ -711,7 +711,7 @@ class TestNodeManager(RMFTestCase): call_mocks = [(0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled('Execute', 'hdp-select set hadoop-yarn-nodemanager {0}'.format(version)) + self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hadoop-yarn-nodemanager', version), sudo=True) self.assertNoMoreResources() self.assertEquals(2, mocks_dict['call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/c1848637/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 fbde404..9d422ed 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 @@ -634,7 +634,7 @@ class TestResourceManager(RMFTestCase): call_mocks = [(0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled('Execute', 'hdp-select set hadoop-yarn-resourcemanager {0}'.format(version)) + self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hadoop-yarn-resourcemanager', version), sudo=True) self.assertNoMoreResources() self.assertEquals(2, mocks_dict['call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/c1848637/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 b69be78..1b16a7d 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 @@ -551,7 +551,7 @@ class TestYarnClient(RMFTestCase): target = RMFTestCase.TARGET_COMMON_SERVICES ) - self.assertResourceCalled("Execute", "hdp-select set hadoop-client 2.2.1.0-2067") + self.assertResourceCalled("Execute", ('hdp-select', 'set', 'hadoop-client', '2.2.1.0-2067'), sudo=True) # for now, it's enough that hdp-select is confirmed @@ -573,7 +573,7 @@ class TestYarnClient(RMFTestCase): call_mocks = [(0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled('Execute', 'hdp-select set hadoop-client {0}'.format(version)) + self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hadoop-client', version), sudo=True) self.assertNoMoreResources() self.assertEquals(2, mocks_dict['call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/c1848637/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 c8736da..ba87fe5 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 @@ -167,7 +167,7 @@ class TestZookeeperClient(RMFTestCase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Execute', - 'hdp-select set zookeeper-client %s' % version) + ('hdp-select', 'set', 'zookeeper-client', version), sudo=True) self.assertNoMoreResources() @patch("resource_management.core.shell.call") @@ -191,7 +191,7 @@ class TestZookeeperClient(RMFTestCase): mocks_dict = mocks_dict) self.assertResourceCalled('Execute', - 'hdp-select set zookeeper-client %s' % version) + ('hdp-select', 'set', 'zookeeper-client', version), sudo=True) self.assertEquals(2, mocks_dict['call'].call_count) self.assertEquals( http://git-wip-us.apache.org/repos/asf/ambari/blob/c1848637/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 dc2d062..bb5f237 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 @@ -353,7 +353,7 @@ class TestZookeeperServer(RMFTestCase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Execute', - 'hdp-select set zookeeper-server %s' % version) + ('hdp-select', 'set', 'zookeeper-server', version), sudo=True) self.assertNoMoreResources() @patch("resource_management.core.shell.call") @@ -377,7 +377,7 @@ class TestZookeeperServer(RMFTestCase): mocks_dict = mocks_dict) self.assertResourceCalled('Execute', - 'hdp-select set zookeeper-server %s' % version) + ('hdp-select', 'set', 'zookeeper-server', version), sudo=True) self.assertEquals(2, mocks_dict['call'].call_count) self.assertEquals( http://git-wip-us.apache.org/repos/asf/ambari/blob/c1848637/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 abff777..8e6c142 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 @@ -117,7 +117,7 @@ class TestFalconClient(RMFTestCase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Execute', - 'hdp-select set falcon-client %s' % version,) + ('hdp-select', 'set', 'falcon-client', version), sudo=True,) self.assertNoMoreResources() @patch("resource_management.core.shell.call") @@ -139,7 +139,7 @@ class TestFalconClient(RMFTestCase): mocks_dict = mocks_dict) self.assertResourceCalled('Execute', - 'hdp-select set falcon-client %s' % version,) + ('hdp-select', 'set', 'falcon-client', version), sudo=True,) self.assertNoMoreResources() self.assertEquals(2, mocks_dict['call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/c1848637/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 521f4a6..85e99d3 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 @@ -207,7 +207,7 @@ class TestFalconServer(RMFTestCase): self.assertResourceCalled('File', '/var/run/falcon/falcon.pid', action = ['delete']) - self.assertResourceCalled('Execute', 'hdp-select set falcon-server 2.2.1.0-2135') + self.assertResourceCalled('Execute', ('hdp-select', 'set', 'falcon-server', '2.2.1.0-2135'), sudo=True) # 4 calls to tarfile.open (2 directories * read + write) self.assertTrue(tarfile_open_mock.called) @@ -349,7 +349,7 @@ class TestFalconServer(RMFTestCase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Execute', - 'hdp-select set falcon-server %s' % version,) + ('hdp-select', 'set', 'falcon-server', version), sudo=True,) self.assertTrue(tarfile_open_mock.called) self.assertTrue(rmtree_mock.called) self.printResources() @@ -378,7 +378,7 @@ class TestFalconServer(RMFTestCase): mocks_dict = mocks_dict) self.assertResourceCalled('Execute', - 'hdp-select set falcon-server %s' % version,) + ('hdp-select', 'set', 'falcon-server', version), sudo=True,) self.assertNoMoreResources() self.assertEquals(2, mocks_dict['call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/c1848637/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 872372d..8d6c5c9 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 @@ -500,7 +500,7 @@ class TestHiveMetastore(RMFTestCase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Execute', - 'hdp-select set hive-metastore %s' % version,) + ('hdp-select', 'set', 'hive-metastore', version), sudo=True,) self.assertNoMoreResources() @patch("resource_management.core.shell.call") @@ -522,7 +522,7 @@ class TestHiveMetastore(RMFTestCase): mocks_dict = mocks_dict) self.assertResourceCalled('Execute', - 'hdp-select set hive-metastore %s' % version,) + ('hdp-select', 'set', 'hive-metastore', version), sudo=True,) self.assertNoMoreResources() self.assertEquals(2, mocks_dict['call'].call_count) @@ -580,6 +580,6 @@ class TestHiveMetastore(RMFTestCase): logoutput = True, environment = {'HIVE_CONF_DIR': '/usr/hdp/current/hive-server2/conf/conf.server'}, tries = 1, user = 'hive') - self.assertResourceCalled('Execute', 'hdp-select set hive-metastore %s' % version,) + self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hive-metastore', version), sudo=True,) self.assertNoMoreResources() \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/c1848637/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_drpc_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_drpc_server.py b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_drpc_server.py index d2af9ac..0a0641c 100644 --- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_drpc_server.py +++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_drpc_server.py @@ -150,7 +150,7 @@ class TestStormDrpcServer(TestStormBase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) - self.assertResourceCalled("Execute", "hdp-select set storm-client 2.2.1.0-2067") + self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-client', '2.2.1.0-2067'), sudo=True) def test_pre_rolling_restart_23(self): config_file = self.get_src_folder()+"/test/python/stacks/2.1/configs/default.json" @@ -169,7 +169,7 @@ class TestStormDrpcServer(TestStormBase): call_mocks = [(0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled("Execute", "hdp-select set storm-client 2.3.0.0-1234") + self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-client', '2.3.0.0-1234'), sudo=True) self.assertEquals(2, mocks_dict['call'].call_count) self.assertEquals( http://git-wip-us.apache.org/repos/asf/ambari/blob/c1848637/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus.py b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus.py index aca528d..720ec82 100644 --- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus.py +++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus.py @@ -149,8 +149,8 @@ class TestStormNimbus(TestStormBase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) - self.assertResourceCalled("Execute", "hdp-select set storm-client 2.2.1.0-2067") - self.assertResourceCalled("Execute", "hdp-select set storm-nimbus 2.2.1.0-2067") + self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-client', '2.2.1.0-2067'), sudo=True) + self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-nimbus', '2.2.1.0-2067'), sudo=True) def test_pre_rolling_restart_23(self): config_file = self.get_src_folder()+"/test/python/stacks/2.1/configs/default.json" @@ -169,8 +169,8 @@ class TestStormNimbus(TestStormBase): call_mocks = [(0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled("Execute", "hdp-select set storm-client 2.3.0.0-1234") - self.assertResourceCalled("Execute", "hdp-select set storm-nimbus 2.3.0.0-1234") + self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-client', '2.3.0.0-1234'), sudo=True) + self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-nimbus', '2.3.0.0-1234'), sudo=True) self.assertEquals(2, mocks_dict['call'].call_count) self.assertEquals( http://git-wip-us.apache.org/repos/asf/ambari/blob/c1848637/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus_prod.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus_prod.py b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus_prod.py index 85a4a2c..d4054ca 100644 --- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus_prod.py +++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus_prod.py @@ -114,8 +114,8 @@ class TestStormNimbus(TestStormBase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) - self.assertResourceCalled("Execute", "hdp-select set storm-client 2.2.1.0-2067") - self.assertResourceCalled("Execute", "hdp-select set storm-nimbus 2.2.1.0-2067") + self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-client', '2.2.1.0-2067'), sudo=True) + self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-nimbus', '2.2.1.0-2067'), sudo=True) def test_pre_rolling_restart_23(self): config_file = self.get_src_folder()+"/test/python/stacks/2.1/configs/default.json" @@ -134,8 +134,8 @@ class TestStormNimbus(TestStormBase): call_mocks = [(0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled("Execute", "hdp-select set storm-client 2.3.0.0-1234") - self.assertResourceCalled("Execute", "hdp-select set storm-nimbus 2.3.0.0-1234") + self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-client', '2.3.0.0-1234'), sudo=True) + self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-nimbus', '2.3.0.0-1234'), sudo=True) self.assertEquals(2, mocks_dict['call'].call_count) self.assertEquals( http://git-wip-us.apache.org/repos/asf/ambari/blob/c1848637/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_rest_api_service.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_rest_api_service.py b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_rest_api_service.py index 5c36377..f052dd5 100644 --- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_rest_api_service.py +++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_rest_api_service.py @@ -149,7 +149,7 @@ class TestStormRestApi(TestStormBase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) - self.assertResourceCalled("Execute", "hdp-select set storm-client 2.2.1.0-2067") + self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-client', '2.2.1.0-2067'), sudo=True) def test_pre_rolling_restart_23(self): config_file = self.get_src_folder()+"/test/python/stacks/2.1/configs/default.json" @@ -168,7 +168,7 @@ class TestStormRestApi(TestStormBase): call_mocks = [(0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled("Execute", "hdp-select set storm-client 2.3.0.0-1234") + self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-client', '2.3.0.0-1234'), sudo=True) self.assertEquals(2, mocks_dict['call'].call_count) self.assertEquals( http://git-wip-us.apache.org/repos/asf/ambari/blob/c1848637/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor.py b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor.py index cc40b7b..1953fa1 100644 --- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor.py +++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor.py @@ -194,8 +194,8 @@ class TestStormSupervisor(TestStormBase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) - self.assertResourceCalled("Execute", "hdp-select set storm-client 2.2.1.0-2067") - self.assertResourceCalled("Execute", "hdp-select set storm-supervisor 2.2.1.0-2067") + self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-client', '2.2.1.0-2067'), sudo=True) + self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-supervisor', '2.2.1.0-2067'), sudo=True) def test_pre_rolling_restart_23(self): config_file = self.get_src_folder()+"/test/python/stacks/2.1/configs/default.json" @@ -214,8 +214,8 @@ class TestStormSupervisor(TestStormBase): call_mocks = [(0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled("Execute", "hdp-select set storm-client 2.3.0.0-1234") - self.assertResourceCalled("Execute", "hdp-select set storm-supervisor 2.3.0.0-1234") + self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-client', '2.3.0.0-1234'), sudo=True) + self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-supervisor', '2.3.0.0-1234'), sudo=True) self.assertEquals(2, mocks_dict['call'].call_count) self.assertEquals( http://git-wip-us.apache.org/repos/asf/ambari/blob/c1848637/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor_prod.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor_prod.py b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor_prod.py index 1909078..0855317 100644 --- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor_prod.py +++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor_prod.py @@ -163,8 +163,8 @@ class TestStormSupervisor(TestStormBase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) - self.assertResourceCalled("Execute", "hdp-select set storm-client 2.2.1.0-2067") - self.assertResourceCalled("Execute", "hdp-select set storm-supervisor 2.2.1.0-2067") + self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-client', '2.2.1.0-2067'), sudo=True) + self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-supervisor', '2.2.1.0-2067'), sudo=True) def test_pre_rolling_restart_23(self): config_file = self.get_src_folder()+"/test/python/stacks/2.1/configs/default.json" @@ -183,8 +183,8 @@ class TestStormSupervisor(TestStormBase): call_mocks = [(0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled("Execute", "hdp-select set storm-client 2.3.0.0-1234") - self.assertResourceCalled("Execute", "hdp-select set storm-supervisor 2.3.0.0-1234") + self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-client', '2.3.0.0-1234'), sudo=True) + self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-supervisor', '2.3.0.0-1234'), sudo=True) self.assertEquals(2, mocks_dict['call'].call_count) self.assertEquals( http://git-wip-us.apache.org/repos/asf/ambari/blob/c1848637/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_ui_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_ui_server.py b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_ui_server.py index dbe9a46..550d2db 100644 --- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_ui_server.py +++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_ui_server.py @@ -147,7 +147,7 @@ class TestStormUiServer(TestStormBase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) - self.assertResourceCalled("Execute", "hdp-select set storm-client 2.2.1.0-2067") + self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-client', '2.2.1.0-2067'), sudo=True) def test_pre_rolling_restart_23(self): config_file = self.get_src_folder()+"/test/python/stacks/2.1/configs/default.json" @@ -166,7 +166,7 @@ class TestStormUiServer(TestStormBase): call_mocks = [(0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled("Execute", "hdp-select set storm-client 2.3.0.0-1234") + self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-client', '2.3.0.0-1234'), sudo=True) self.assertEquals(2, mocks_dict['call'].call_count) self.assertEquals( http://git-wip-us.apache.org/repos/asf/ambari/blob/c1848637/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 966ea43..d26813a 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 @@ -73,7 +73,7 @@ class TestTezClient(RMFTestCase): target = RMFTestCase.TARGET_COMMON_SERVICES) get_hdp_version_mock.return_value = "2.2.1.0-2067" - self.assertResourceCalled("Execute", "hdp-select set hadoop-client 2.2.1.0-2067") + self.assertResourceCalled("Execute", ('hdp-select', 'set', 'hadoop-client', '2.2.1.0-2067'), sudo=True) # for now, it's enough that hdp-select is confirmed @@ -87,7 +87,7 @@ class TestTezClient(RMFTestCase): target = RMFTestCase.TARGET_COMMON_SERVICES) get_hdp_version_mock.return_value = "2.2.1.0-2067" - self.assertResourceCalled("Execute", "hdp-select set hadoop-client 2.2.1.0-2067") + self.assertResourceCalled("Execute", ('hdp-select', 'set', 'hadoop-client', '2.2.1.0-2067'), sudo=True) # for now, it's enough that hdp-select is confirmed @@ -108,7 +108,7 @@ class TestTezClient(RMFTestCase): call_mocks = [(0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled('Execute', 'hdp-select set hadoop-client %s' % version) + self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hadoop-client', version), sudo=True) self.assertNoMoreResources() self.assertEquals(2, mocks_dict['call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/c1848637/ambari-server/src/test/python/stacks/2.1/YARN/test_apptimelineserver.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/YARN/test_apptimelineserver.py b/ambari-server/src/test/python/stacks/2.1/YARN/test_apptimelineserver.py index 037823c..19888a9 100644 --- a/ambari-server/src/test/python/stacks/2.1/YARN/test_apptimelineserver.py +++ b/ambari-server/src/test/python/stacks/2.1/YARN/test_apptimelineserver.py @@ -392,7 +392,7 @@ class TestAppTimelineServer(RMFTestCase): call_mocks = [(0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled('Execute', 'hdp-select set hadoop-yarn-timelineserver {0}'.format(version)) + self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hadoop-yarn-timelineserver', version), sudo=True) self.assertNoMoreResources() self.assertEquals(2, mocks_dict['call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/c1848637/ambari-server/src/test/python/stacks/2.2/ACCUMULO/test_accumulo_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/ACCUMULO/test_accumulo_client.py b/ambari-server/src/test/python/stacks/2.2/ACCUMULO/test_accumulo_client.py index 18c71e3..efce00d 100644 --- a/ambari-server/src/test/python/stacks/2.2/ACCUMULO/test_accumulo_client.py +++ b/ambari-server/src/test/python/stacks/2.2/ACCUMULO/test_accumulo_client.py @@ -42,7 +42,7 @@ class TestAccumuloClient(RMFTestCase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) - self.assertResourceCalled('Execute', 'hdp-select set accumulo-client %s' % version,) + self.assertResourceCalled('Execute', ('hdp-select', 'set', 'accumulo-client', version), sudo=True,) self.assertNoMoreResources() @patch("resource_management.core.shell.call") @@ -65,7 +65,7 @@ class TestAccumuloClient(RMFTestCase): call_mocks = [(0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled('Execute', 'hdp-select set accumulo-client %s' % version,) + self.assertResourceCalled('Execute', ('hdp-select', 'set', 'accumulo-client', version), sudo=True,) self.assertNoMoreResources() self.assertEquals(2, mocks_dict['call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/c1848637/ambari-server/src/test/python/stacks/2.2/KAFKA/test_kafka_broker.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/KAFKA/test_kafka_broker.py b/ambari-server/src/test/python/stacks/2.2/KAFKA/test_kafka_broker.py index 04e904a..6261402 100644 --- a/ambari-server/src/test/python/stacks/2.2/KAFKA/test_kafka_broker.py +++ b/ambari-server/src/test/python/stacks/2.2/KAFKA/test_kafka_broker.py @@ -110,7 +110,7 @@ class TestKafkaBroker(RMFTestCase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Execute', - 'hdp-select set kafka-broker %s' % version,) + ('hdp-select', 'set', 'kafka-broker', version), sudo=True,) self.assertNoMoreResources() @patch("resource_management.core.shell.call") @@ -132,7 +132,7 @@ class TestKafkaBroker(RMFTestCase): mocks_dict = mocks_dict) self.assertResourceCalled('Execute', - 'hdp-select set kafka-broker %s' % version,) + ('hdp-select', 'set', 'kafka-broker', version), sudo=True,) self.assertNoMoreResources() self.assertEquals(2, mocks_dict['call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/c1848637/ambari-server/src/test/python/stacks/2.2/KNOX/test_knox_gateway.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/KNOX/test_knox_gateway.py b/ambari-server/src/test/python/stacks/2.2/KNOX/test_knox_gateway.py index 363a245..4d3e5f3 100644 --- a/ambari-server/src/test/python/stacks/2.2/KNOX/test_knox_gateway.py +++ b/ambari-server/src/test/python/stacks/2.2/KNOX/test_knox_gateway.py @@ -257,7 +257,7 @@ class TestKnoxGateway(RMFTestCase): self.assertTrue(tarfile_open_mock.called) - self.assertResourceCalled("Execute", "hdp-select set knox-server %s" % version) + self.assertResourceCalled("Execute", ('hdp-select', 'set', 'knox-server', version), sudo=True) @patch("os.remove") @patch("os.path.exists") @@ -288,7 +288,7 @@ class TestKnoxGateway(RMFTestCase): self.assertTrue(tarfile_open_mock.called) - self.assertResourceCalled("Execute", "hdp-select set knox-server %s" % version) + self.assertResourceCalled("Execute", ('hdp-select', 'set', 'knox-server', version), sudo=True) self.assertEquals(2, mocks_dict['call'].call_count) self.assertEquals( http://git-wip-us.apache.org/repos/asf/ambari/blob/c1848637/ambari-server/src/test/python/stacks/2.2/RANGER/test_ranger_admin.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/RANGER/test_ranger_admin.py b/ambari-server/src/test/python/stacks/2.2/RANGER/test_ranger_admin.py index 5413342..4662a57 100644 --- a/ambari-server/src/test/python/stacks/2.2/RANGER/test_ranger_admin.py +++ b/ambari-server/src/test/python/stacks/2.2/RANGER/test_ranger_admin.py @@ -182,7 +182,7 @@ class TestRangerAdmin(RMFTestCase): call_mocks = [(0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled("Execute", "hdp-select set ranger-admin 2.3.0.0-1234") + self.assertResourceCalled("Execute", ('hdp-select', 'set', 'ranger-admin', '2.3.0.0-1234'), sudo=True) self.assertEquals(2, mocks_dict['call'].call_count) self.assertEquals( http://git-wip-us.apache.org/repos/asf/ambari/blob/c1848637/ambari-server/src/test/python/stacks/2.2/RANGER/test_ranger_usersync.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/RANGER/test_ranger_usersync.py b/ambari-server/src/test/python/stacks/2.2/RANGER/test_ranger_usersync.py index 48358cc..b155de2 100644 --- a/ambari-server/src/test/python/stacks/2.2/RANGER/test_ranger_usersync.py +++ b/ambari-server/src/test/python/stacks/2.2/RANGER/test_ranger_usersync.py @@ -122,7 +122,7 @@ class TestRangerUsersync(RMFTestCase): environment = {'JAVA_HOME': u'/usr/jdk64/jdk1.7.0_67'}, sudo = True ) - self.assertResourceCalled("Execute", "hdp-select set ranger-usersync 2.2.2.0-2399") + self.assertResourceCalled("Execute", ('hdp-select', 'set', 'ranger-usersync', '2.2.2.0-2399'), sudo=True) @patch("setup_ranger.setup_usersync") def test_upgrade_23(self, setup_usersync_mock): @@ -145,7 +145,7 @@ class TestRangerUsersync(RMFTestCase): self.assertResourceCalled("Execute", ("/usr/bin/ranger-usersync-stop",), environment = {'JAVA_HOME': u'/usr/jdk64/jdk1.7.0_67'}, sudo = True) - self.assertResourceCalled("Execute", "hdp-select set ranger-usersync 2.3.0.0-1234") + self.assertResourceCalled("Execute", ('hdp-select', 'set', 'ranger-usersync', '2.3.0.0-1234'), sudo=True) self.assertEquals(3, mocks_dict['call'].call_count) self.assertEquals( http://git-wip-us.apache.org/repos/asf/ambari/blob/c1848637/ambari-server/src/test/python/stacks/2.2/SLIDER/test_slider_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/SLIDER/test_slider_client.py b/ambari-server/src/test/python/stacks/2.2/SLIDER/test_slider_client.py index af876b9..792388d 100644 --- a/ambari-server/src/test/python/stacks/2.2/SLIDER/test_slider_client.py +++ b/ambari-server/src/test/python/stacks/2.2/SLIDER/test_slider_client.py @@ -115,8 +115,8 @@ class TestSliderClient(RMFTestCase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) - self.assertResourceCalled("Execute", "hdp-select set slider-client 2.2.1.0-2067") - self.assertResourceCalled("Execute", "hdp-select set hadoop-client 2.2.1.0-2067") + self.assertResourceCalled("Execute", ('hdp-select', 'set', 'slider-client', '2.2.1.0-2067'), sudo=True) + self.assertResourceCalled("Execute", ('hdp-select', 'set', 'hadoop-client', '2.2.1.0-2067'), sudo=True) self.assertNoMoreResources() @@ -136,8 +136,8 @@ class TestSliderClient(RMFTestCase): call_mocks = [(0, None), (0, None), (0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled("Execute", "hdp-select set slider-client 2.3.0.0-1234") - self.assertResourceCalled("Execute", "hdp-select set hadoop-client 2.3.0.0-1234") + self.assertResourceCalled("Execute", ('hdp-select', 'set', 'slider-client', '2.3.0.0-1234'), sudo=True) + self.assertResourceCalled("Execute", ('hdp-select', 'set', 'hadoop-client', '2.3.0.0-1234'), sudo=True) self.assertNoMoreResources() self.assertEquals(4, mocks_dict['call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/c1848637/ambari-server/src/test/python/stacks/2.2/SPARK/test_job_history_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/SPARK/test_job_history_server.py b/ambari-server/src/test/python/stacks/2.2/SPARK/test_job_history_server.py index db83824..6418f18 100644 --- a/ambari-server/src/test/python/stacks/2.2/SPARK/test_job_history_server.py +++ b/ambari-server/src/test/python/stacks/2.2/SPARK/test_job_history_server.py @@ -294,7 +294,7 @@ class TestJobHistoryServer(RMFTestCase): call_mocks = [(0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled('Execute', 'hdp-select set spark-historyserver {0}'.format(version)) + self.assertResourceCalled('Execute', ('hdp-select', 'set', 'spark-historyserver', version), sudo=True) self.assertNoMoreResources() self.assertEquals(2, mocks_dict['call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/c1848637/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 d27aec2..cbff0aa 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 @@ -137,7 +137,7 @@ class TestSparkClient(RMFTestCase): call_mocks = [(0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled('Execute', 'hdp-select set spark-client {0}'.format(version)) + self.assertResourceCalled('Execute', ('hdp-select', 'set', 'spark-client', version), sudo=True) self.assertNoMoreResources() self.assertEquals(2, mocks_dict['call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/c1848637/ambari-server/src/test/python/stacks/2.3/MAHOUT/test_mahout_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/MAHOUT/test_mahout_client.py b/ambari-server/src/test/python/stacks/2.3/MAHOUT/test_mahout_client.py index 6b61b1a..201700b 100644 --- a/ambari-server/src/test/python/stacks/2.3/MAHOUT/test_mahout_client.py +++ b/ambari-server/src/test/python/stacks/2.3/MAHOUT/test_mahout_client.py @@ -64,7 +64,7 @@ class TestMahoutClient(RMFTestCase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) - self.assertResourceCalled('Execute', "hdp-select set mahout-client 2.2.1.0-3242") + self.assertResourceCalled('Execute', ('hdp-select', 'set', 'mahout-client', '2.2.1.0-3242'), sudo=True) self.assertNoMoreResources() def test_pre_rolling_restart_23(self): @@ -91,7 +91,7 @@ class TestMahoutClient(RMFTestCase): call_mocks = itertools.cycle([(0, None)]), mocks_dict = mocks_dict) - self.assertResourceCalled('Execute', "hdp-select set mahout-client 2.3.0.0-1234") + self.assertResourceCalled('Execute', ('hdp-select', 'set', 'mahout-client', '2.3.0.0-1234'), sudo=True) self.assertNoMoreResources() import sys
