You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2015/11/22 17:06:07 UTC
[1/2] ambari git commit: AMBARI-14006. During Component Install
conf-select Shell Uses Current Working Directory That Doesn't Exist Yet
(aonishuk)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 9c9c910c8 -> 15bdb771c
refs/heads/trunk 45bb354c7 -> 033b74632
AMBARI-14006. During Component Install conf-select Shell Uses Current Working Directory That Doesn't Exist Yet (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/033b7463
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/033b7463
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/033b7463
Branch: refs/heads/trunk
Commit: 033b74632c768389fed9e7a13a93c94d8c756da2
Parents: 45bb354
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Sun Nov 22 18:05:57 2015 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Sun Nov 22 18:05:57 2015 +0200
----------------------------------------------------------------------
.../resource_management/libraries/functions/conf_select.py | 3 ++-
.../src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py | 2 +-
.../src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py | 2 +-
.../test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py | 2 +-
.../test/python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py | 2 +-
.../src/test/python/stacks/2.0.6/HDFS/test_datanode.py | 2 +-
.../src/test/python/stacks/2.0.6/HDFS/test_hdfs_client.py | 2 +-
.../src/test/python/stacks/2.0.6/HDFS/test_journalnode.py | 2 +-
.../src/test/python/stacks/2.0.6/HDFS/test_namenode.py | 1 +
.../src/test/python/stacks/2.0.6/HDFS/test_nfsgateway.py | 2 +-
.../src/test/python/stacks/2.0.6/HIVE/test_hive_client.py | 2 +-
.../src/test/python/stacks/2.0.6/HIVE/test_hive_server.py | 2 +-
.../src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py | 2 +-
.../src/test/python/stacks/2.0.6/OOZIE/test_oozie_client.py | 2 +-
.../src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py | 4 ++--
.../src/test/python/stacks/2.0.6/PIG/test_pig_client.py | 2 +-
ambari-server/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 | 2 +-
.../src/test/python/stacks/2.0.6/YARN/test_nodemanager.py | 2 +-
.../src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py | 2 +-
.../src/test/python/stacks/2.0.6/YARN/test_yarn_client.py | 2 +-
.../python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_client.py | 2 +-
.../python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py | 2 +-
.../src/test/python/stacks/2.1/FALCON/test_falcon_client.py | 2 +-
.../src/test/python/stacks/2.1/FALCON/test_falcon_server.py | 2 +-
.../src/test/python/stacks/2.1/HIVE/test_hive_metastore.py | 6 +++---
.../src/test/python/stacks/2.1/STORM/test_storm_drpc_server.py | 2 +-
.../src/test/python/stacks/2.1/STORM/test_storm_nimbus.py | 2 +-
.../src/test/python/stacks/2.1/STORM/test_storm_nimbus_prod.py | 2 +-
.../src/test/python/stacks/2.1/STORM/test_storm_supervisor.py | 2 +-
.../test/python/stacks/2.1/STORM/test_storm_supervisor_prod.py | 2 +-
.../src/test/python/stacks/2.1/STORM/test_storm_ui_server.py | 2 +-
.../src/test/python/stacks/2.1/TEZ/test_tez_client.py | 2 +-
.../src/test/python/stacks/2.1/YARN/test_apptimelineserver.py | 2 +-
.../test/python/stacks/2.2/ACCUMULO/test_accumulo_client.py | 2 +-
.../src/test/python/stacks/2.2/KAFKA/test_kafka_broker.py | 2 +-
.../src/test/python/stacks/2.2/KNOX/test_knox_gateway.py | 6 +++---
.../src/test/python/stacks/2.2/RANGER/test_ranger_admin.py | 2 +-
.../src/test/python/stacks/2.2/RANGER/test_ranger_usersync.py | 2 +-
.../src/test/python/stacks/2.2/SLIDER/test_slider_client.py | 2 +-
.../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 | 2 +-
.../test/python/stacks/2.3/SPARK/test_spark_thrift_server.py | 2 +-
45 files changed, 51 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/033b7463/ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py b/ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py
index 9bf259b..f0c63c6 100644
--- a/ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py
+++ b/ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py
@@ -23,6 +23,7 @@ __all__ = ["select", "create", "get_hadoop_conf_dir", "get_hadoop_dir"]
import os
import version
import hdp_select
+import subprocess
from resource_management.core import shell
from resource_management.libraries.script.script import Script
@@ -202,7 +203,7 @@ def create(stack_name, package, version, dry_run = False):
command = "dry-run-create" if dry_run else "create-conf-dir"
- code, stdout = shell.call(get_cmd(command, package, version), logoutput=False, quiet=False, sudo=True)
+ code, stdout, stderr = shell.call(get_cmd(command, package, version), logoutput=False, quiet=False, sudo=True, stderr = subprocess.PIPE)
# conf-select can set more than one directory
# per package, so return that list, especially for dry_run
http://git-wip-us.apache.org/repos/asf/ambari/blob/033b7463/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 9371cac..3d55c31 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
@@ -259,7 +259,7 @@ class TestHBaseClient(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None), (0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None, ''), (0, None, ''), (0, None, '')],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hbase-client', version), sudo=True)
http://git-wip-us.apache.org/repos/asf/ambari/blob/033b7463/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 d8e07ec..1bf2806 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
@@ -819,7 +819,7 @@ class TestHBaseMaster(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None), (0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None, ''), (0, None, ''), (0, None, '')],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hbase-master', version), sudo=True)
http://git-wip-us.apache.org/repos/asf/ambari/blob/033b7463/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 6555024..3ec3b83 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
@@ -719,7 +719,7 @@ class TestHbaseRegionServer(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None), (0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None), (0, None), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hbase-regionserver', version), sudo=True)
http://git-wip-us.apache.org/repos/asf/ambari/blob/033b7463/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 743fa96..56900c8 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
@@ -446,7 +446,7 @@ class TestPhoenixQueryServer(RMFTestCase):
classname = "PhoenixQueryServer",
command = "pre_upgrade_restart",
config_dict = json_content,
- call_mocks = [(0, "/etc/hbase/2.3.0.0-1234/0")],
+ call_mocks = [(0, "/etc/hbase/2.3.0.0-1234/0", '')],
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES)
http://git-wip-us.apache.org/repos/asf/ambari/blob/033b7463/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 b1d4f13..c94948c 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
@@ -459,7 +459,7 @@ class TestDatanode(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hadoop-hdfs-datanode', version), sudo=True,)
http://git-wip-us.apache.org/repos/asf/ambari/blob/033b7463/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 055f291..eade3b9 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
@@ -201,7 +201,7 @@ class Test(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hadoop-client', version), sudo=True,)
http://git-wip-us.apache.org/repos/asf/ambari/blob/033b7463/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 8d2da19..f21f3dd 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
@@ -478,7 +478,7 @@ class TestJournalnode(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hadoop-hdfs-journalnode', version), sudo=True,)
http://git-wip-us.apache.org/repos/asf/ambari/blob/033b7463/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 6f8dc32..fa6d86a 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
@@ -1409,6 +1409,7 @@ class TestNamenode(RMFTestCase):
config_file = "nn_eu_standby.json",
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict=mocks_dict)
calls = mocks_dict['call'].call_args_list
http://git-wip-us.apache.org/repos/asf/ambari/blob/033b7463/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_nfsgateway.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_nfsgateway.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_nfsgateway.py
index 32f627e..47cb378 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_nfsgateway.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_nfsgateway.py
@@ -387,7 +387,7 @@ class TestNFSGateway(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None), (0, None), (0, None)])
+ call_mocks = [(0, None, ''), (0, None), (0, None), (0, None)])
self.assertResourceCalled('Execute',
('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hadoop-hdfs-nfs3', version), sudo=True,)
self.assertNoMoreResources()
http://git-wip-us.apache.org/repos/asf/ambari/blob/033b7463/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 d600a65..2788a04 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
@@ -206,7 +206,7 @@ class TestHiveClient(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None), (0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None, ''), (0, None, ''), (0, None, '')],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute',
http://git-wip-us.apache.org/repos/asf/ambari/blob/033b7463/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 7eedeb6..69db9ee 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
@@ -949,7 +949,7 @@ From source with checksum 150f554beae04f76f814f59549dead8b"""
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None, '')],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute',
http://git-wip-us.apache.org/repos/asf/ambari/blob/033b7463/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 b9b1ce9..af16a33 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
@@ -377,7 +377,7 @@ class TestWebHCatServer(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None, '')],
mocks_dict = mocks_dict)
self.assertTrue("params" in sys.modules)
http://git-wip-us.apache.org/repos/asf/ambari/blob/033b7463/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 8219f6e..a7f5adf 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
@@ -230,7 +230,7 @@ class TestOozieClient(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute',
http://git-wip-us.apache.org/repos/asf/ambari/blob/033b7463/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 a437916..7edd867 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
@@ -1232,7 +1232,7 @@ class TestOozieServer(RMFTestCase):
classname = "OozieServer", command = "pre_upgrade_restart", config_dict = json_content,
hdp_stack_version = self.UPGRADE_STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, prepare_war_stdout)],
+ call_mocks = [(0, None, ''), (0, prepare_war_stdout)],
mocks_dict = mocks_dict)
self.assertTrue(isfile_mock.called)
@@ -1490,7 +1490,7 @@ class TestOozieServer(RMFTestCase):
classname = "OozieServer", command = "pre_upgrade_restart", config_dict = json_content,
hdp_stack_version = self.UPGRADE_STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, prepare_war_stdout)],
+ call_mocks = [(0, None, ''), (0, prepare_war_stdout)],
mocks_dict = mocks_dict)
self.assertTrue(isfile_mock.called)
http://git-wip-us.apache.org/repos/asf/ambari/blob/033b7463/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 5ba79dd..85fbbad 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
@@ -163,7 +163,7 @@ class TestPigClient(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None, '')],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute',
http://git-wip-us.apache.org/repos/asf/ambari/blob/033b7463/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 7971ed3..cf94b48 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
@@ -126,7 +126,7 @@ class TestSqoop(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'sqoop-client', version), sudo=True)
http://git-wip-us.apache.org/repos/asf/ambari/blob/033b7463/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 14c41bd..88fbba7 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
@@ -818,7 +818,7 @@ class TestHistoryServer(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hadoop-mapreduce-historyserver', version), sudo=True)
http://git-wip-us.apache.org/repos/asf/ambari/blob/033b7463/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 8543c32..361376d 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
@@ -403,7 +403,7 @@ class TestMapReduce2Client(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hadoop-client', version), sudo=True)
http://git-wip-us.apache.org/repos/asf/ambari/blob/033b7463/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 6708e19..6973ccf 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
@@ -719,7 +719,7 @@ class TestNodeManager(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hadoop-yarn-nodemanager', version), sudo=True)
http://git-wip-us.apache.org/repos/asf/ambari/blob/033b7463/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 8d7149e..2d24059 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
@@ -633,7 +633,7 @@ class TestResourceManager(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hadoop-yarn-resourcemanager', version), sudo=True)
http://git-wip-us.apache.org/repos/asf/ambari/blob/033b7463/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 de5577e..80d4ef1 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
@@ -573,7 +573,7 @@ class TestYarnClient(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hadoop-client', version), sudo=True)
http://git-wip-us.apache.org/repos/asf/ambari/blob/033b7463/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 51e3258..63c6fd8 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
@@ -193,7 +193,7 @@ class TestZookeeperClient(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute',
http://git-wip-us.apache.org/repos/asf/ambari/blob/033b7463/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 0ad694c..f83df6f 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
@@ -379,7 +379,7 @@ class TestZookeeperServer(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute',
http://git-wip-us.apache.org/repos/asf/ambari/blob/033b7463/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 685eb50..c10ee8a 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
@@ -140,7 +140,7 @@ class TestFalconClient(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute',
http://git-wip-us.apache.org/repos/asf/ambari/blob/033b7463/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 96ee2db..6eb60ce 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
@@ -535,7 +535,7 @@ class TestFalconServer(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute',
http://git-wip-us.apache.org/repos/asf/ambari/blob/033b7463/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 630611b..63c2449 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
@@ -517,7 +517,7 @@ class TestHiveMetastore(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute',
@@ -602,7 +602,7 @@ class TestHiveMetastore(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
# we don't care about configure here - the strings are different anyway because this
@@ -690,7 +690,7 @@ class TestHiveMetastore(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
# we don't care about configure here - the strings are different anyway because this
http://git-wip-us.apache.org/repos/asf/ambari/blob/033b7463/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 c41ef4b..cef5b97 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
@@ -173,7 +173,7 @@ class TestStormDrpcServer(TestStormBase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'storm-client', '2.3.0.0-1234'), sudo=True)
http://git-wip-us.apache.org/repos/asf/ambari/blob/033b7463/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 4c12470..8ede94c 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
@@ -172,7 +172,7 @@ class TestStormNimbus(TestStormBase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'storm-client', '2.3.0.0-1234'), sudo=True)
http://git-wip-us.apache.org/repos/asf/ambari/blob/033b7463/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 14cc056..2aa3df5 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
@@ -137,7 +137,7 @@ class TestStormNimbus(TestStormBase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None, '')],
mocks_dict = mocks_dict)
self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'storm-client', '2.3.0.0-1234'), sudo=True)
http://git-wip-us.apache.org/repos/asf/ambari/blob/033b7463/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 0600a71..d8c79ac 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
@@ -218,7 +218,7 @@ class TestStormSupervisor(TestStormBase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'storm-client', '2.3.0.0-1234'), sudo=True)
http://git-wip-us.apache.org/repos/asf/ambari/blob/033b7463/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 b49a519..ff43e43 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
@@ -187,7 +187,7 @@ class TestStormSupervisor(TestStormBase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'storm-client', '2.3.0.0-1234'), sudo=True)
http://git-wip-us.apache.org/repos/asf/ambari/blob/033b7463/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 a966b89..dc00139 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
@@ -171,7 +171,7 @@ class TestStormUiServer(TestStormBase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'storm-client', '2.3.0.0-1234'), sudo=True)
http://git-wip-us.apache.org/repos/asf/ambari/blob/033b7463/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 937be1d..de9e7cc 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
@@ -105,7 +105,7 @@ class TestTezClient(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None), (0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None, ''), (0, None, ''), (0, None, '')],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hadoop-client', version), sudo=True)
http://git-wip-us.apache.org/repos/asf/ambari/blob/033b7463/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 2edf9d7..4748fb0 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
@@ -406,7 +406,7 @@ class TestAppTimelineServer(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None, '')],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hadoop-yarn-timelineserver', version), sudo=True)
http://git-wip-us.apache.org/repos/asf/ambari/blob/033b7463/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 f2f72e4..f3f8d67 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
@@ -64,7 +64,7 @@ class TestAccumuloClient(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'accumulo-client', version), sudo=True,)
http://git-wip-us.apache.org/repos/asf/ambari/blob/033b7463/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 f76e5ed..2259b47 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
@@ -131,7 +131,7 @@ class TestKafkaBroker(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute',
http://git-wip-us.apache.org/repos/asf/ambari/blob/033b7463/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 193d707..4edb7eb 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
@@ -292,7 +292,7 @@ class TestKnoxGateway(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute', ('tar',
@@ -364,7 +364,7 @@ class TestKnoxGateway(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute', ('tar',
@@ -436,7 +436,7 @@ class TestKnoxGateway(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute', ('tar',
http://git-wip-us.apache.org/repos/asf/ambari/blob/033b7463/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 ecb13f6..80bbbaf 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
@@ -208,7 +208,7 @@ class TestRangerAdmin(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'ranger-admin', '2.3.0.0-1234'), sudo=True)
http://git-wip-us.apache.org/repos/asf/ambari/blob/033b7463/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 fecc734..5cba731 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
@@ -141,7 +141,7 @@ class TestRangerUsersync(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertTrue(setup_usersync_mock.called)
http://git-wip-us.apache.org/repos/asf/ambari/blob/033b7463/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 5f027fd..3d01993 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
@@ -137,7 +137,7 @@ class TestSliderClient(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None), (0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None, ''), (0, None, ''), (0, None, '')],
mocks_dict = mocks_dict)
self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'slider-client', '2.3.0.0-1234'), sudo=True)
http://git-wip-us.apache.org/repos/asf/ambari/blob/033b7463/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 90d3f0a..d24431b 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
@@ -295,7 +295,7 @@ class TestJobHistoryServer(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'spark-historyserver', version), sudo=True)
http://git-wip-us.apache.org/repos/asf/ambari/blob/033b7463/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 798feb8..703ee97 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
@@ -133,7 +133,7 @@ class TestSparkClient(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'spark-client', version), sudo=True)
http://git-wip-us.apache.org/repos/asf/ambari/blob/033b7463/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 57d269c..06645a9 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
@@ -100,7 +100,7 @@ class TestMahoutClient(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = itertools.cycle([(0, None)]),
+ call_mocks = itertools.cycle([(0, None, '')]),
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'mahout-client', '2.3.0.0-1234'),
http://git-wip-us.apache.org/repos/asf/ambari/blob/033b7463/ambari-server/src/test/python/stacks/2.3/SPARK/test_spark_thrift_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.3/SPARK/test_spark_thrift_server.py b/ambari-server/src/test/python/stacks/2.3/SPARK/test_spark_thrift_server.py
index 05745ae..05a1d0e 100644
--- a/ambari-server/src/test/python/stacks/2.3/SPARK/test_spark_thrift_server.py
+++ b/ambari-server/src/test/python/stacks/2.3/SPARK/test_spark_thrift_server.py
@@ -159,7 +159,7 @@ class TestSparkThriftServer(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'spark-thriftserver', version), sudo=True)
[2/2] ambari git commit: AMBARI-14006. During Component Install
conf-select Shell Uses Current Working Directory That Doesn't Exist Yet
(aonishuk)
Posted by ao...@apache.org.
AMBARI-14006. During Component Install conf-select Shell Uses Current Working Directory That Doesn't Exist Yet (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/15bdb771
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/15bdb771
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/15bdb771
Branch: refs/heads/branch-2.1
Commit: 15bdb771cd24add95e5a7164be858e28d4658cab
Parents: 9c9c910
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Sun Nov 22 18:06:00 2015 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Sun Nov 22 18:06:00 2015 +0200
----------------------------------------------------------------------
.../resource_management/libraries/functions/conf_select.py | 3 ++-
.../src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py | 2 +-
.../src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py | 2 +-
.../test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py | 2 +-
.../test/python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py | 2 +-
.../src/test/python/stacks/2.0.6/HDFS/test_datanode.py | 2 +-
.../src/test/python/stacks/2.0.6/HDFS/test_hdfs_client.py | 2 +-
.../src/test/python/stacks/2.0.6/HDFS/test_journalnode.py | 2 +-
.../src/test/python/stacks/2.0.6/HDFS/test_namenode.py | 1 +
.../src/test/python/stacks/2.0.6/HDFS/test_nfsgateway.py | 2 +-
.../src/test/python/stacks/2.0.6/HIVE/test_hive_client.py | 2 +-
.../src/test/python/stacks/2.0.6/HIVE/test_hive_server.py | 2 +-
.../src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py | 2 +-
.../src/test/python/stacks/2.0.6/OOZIE/test_oozie_client.py | 2 +-
.../src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py | 4 ++--
.../src/test/python/stacks/2.0.6/PIG/test_pig_client.py | 2 +-
ambari-server/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 | 2 +-
.../src/test/python/stacks/2.0.6/YARN/test_nodemanager.py | 2 +-
.../src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py | 2 +-
.../src/test/python/stacks/2.0.6/YARN/test_yarn_client.py | 2 +-
.../python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_client.py | 2 +-
.../python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py | 2 +-
.../src/test/python/stacks/2.1/FALCON/test_falcon_client.py | 2 +-
.../src/test/python/stacks/2.1/FALCON/test_falcon_server.py | 2 +-
.../src/test/python/stacks/2.1/HIVE/test_hive_metastore.py | 6 +++---
.../src/test/python/stacks/2.1/STORM/test_storm_drpc_server.py | 2 +-
.../src/test/python/stacks/2.1/STORM/test_storm_nimbus.py | 2 +-
.../src/test/python/stacks/2.1/STORM/test_storm_nimbus_prod.py | 2 +-
.../src/test/python/stacks/2.1/STORM/test_storm_supervisor.py | 2 +-
.../test/python/stacks/2.1/STORM/test_storm_supervisor_prod.py | 2 +-
.../src/test/python/stacks/2.1/STORM/test_storm_ui_server.py | 2 +-
.../src/test/python/stacks/2.1/TEZ/test_tez_client.py | 2 +-
.../src/test/python/stacks/2.1/YARN/test_apptimelineserver.py | 2 +-
.../test/python/stacks/2.2/ACCUMULO/test_accumulo_client.py | 2 +-
.../src/test/python/stacks/2.2/KAFKA/test_kafka_broker.py | 2 +-
.../src/test/python/stacks/2.2/KNOX/test_knox_gateway.py | 6 +++---
.../src/test/python/stacks/2.2/RANGER/test_ranger_admin.py | 2 +-
.../src/test/python/stacks/2.2/RANGER/test_ranger_usersync.py | 2 +-
.../src/test/python/stacks/2.2/SLIDER/test_slider_client.py | 2 +-
.../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 | 2 +-
.../test/python/stacks/2.3/SPARK/test_spark_thrift_server.py | 2 +-
45 files changed, 51 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/15bdb771/ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py b/ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py
index 6b7d09d..38de8e70 100644
--- a/ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py
+++ b/ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py
@@ -23,6 +23,7 @@ __all__ = ["select", "create", "get_hadoop_conf_dir", "get_hadoop_dir"]
import os
import version
import hdp_select
+import subprocess
from resource_management.core import shell
from resource_management.libraries.script.script import Script
@@ -202,7 +203,7 @@ def create(stack_name, package, version, dry_run = False):
command = "dry-run-create" if dry_run else "create-conf-dir"
- code, stdout = shell.call(get_cmd(command, package, version), logoutput=False, quiet=False, sudo=True)
+ code, stdout, stderr = shell.call(get_cmd(command, package, version), logoutput=False, quiet=False, sudo=True, stderr = subprocess.PIPE)
# conf-select can set more than one directory
# per package, so return that list, especially for dry_run
http://git-wip-us.apache.org/repos/asf/ambari/blob/15bdb771/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 fde28a5..5af78fb 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
@@ -259,7 +259,7 @@ class TestHBaseClient(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None), (0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None, ''), (0, None, ''), (0, None, '')],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hbase-client', version), sudo=True)
http://git-wip-us.apache.org/repos/asf/ambari/blob/15bdb771/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 7602083..09e0935 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
@@ -810,7 +810,7 @@ class TestHBaseMaster(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None), (0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None, ''), (0, None, ''), (0, None, '')],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hbase-master', version), sudo=True)
http://git-wip-us.apache.org/repos/asf/ambari/blob/15bdb771/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 ede200d..5b8fbfe 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
@@ -721,7 +721,7 @@ class TestHbaseRegionServer(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None), (0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None), (0, None), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hbase-regionserver', version), sudo=True)
http://git-wip-us.apache.org/repos/asf/ambari/blob/15bdb771/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 ddb111e..5d38b43 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
@@ -445,7 +445,7 @@ class TestPhoenixQueryServer(RMFTestCase):
classname = "PhoenixQueryServer",
command = "pre_upgrade_restart",
config_dict = json_content,
- call_mocks = [(0, "/etc/hbase/2.3.0.0-1234/0")],
+ call_mocks = [(0, "/etc/hbase/2.3.0.0-1234/0", '')],
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES)
http://git-wip-us.apache.org/repos/asf/ambari/blob/15bdb771/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 350424c..b71df46 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
@@ -459,7 +459,7 @@ class TestDatanode(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hadoop-hdfs-datanode', version), sudo=True,)
http://git-wip-us.apache.org/repos/asf/ambari/blob/15bdb771/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 0747eca..04b6d86 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
@@ -201,7 +201,7 @@ class Test(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hadoop-client', version), sudo=True,)
http://git-wip-us.apache.org/repos/asf/ambari/blob/15bdb771/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 99b49a7..aac75d6 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
@@ -478,7 +478,7 @@ class TestJournalnode(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hadoop-hdfs-journalnode', version), sudo=True,)
http://git-wip-us.apache.org/repos/asf/ambari/blob/15bdb771/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 ef3c5a5..1021d0f 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
@@ -1382,6 +1382,7 @@ class TestNamenode(RMFTestCase):
config_file = "nn_eu_standby.json",
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict=mocks_dict)
calls = mocks_dict['call'].call_args_list
http://git-wip-us.apache.org/repos/asf/ambari/blob/15bdb771/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_nfsgateway.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_nfsgateway.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_nfsgateway.py
index ecaa6c8..b3927b4 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_nfsgateway.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_nfsgateway.py
@@ -384,7 +384,7 @@ class TestNFSGateway(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None), (0, None), (0, None)])
+ call_mocks = [(0, None, ''), (0, None), (0, None), (0, None)])
self.assertResourceCalled('Execute',
('hdp-select', 'set', 'hadoop-hdfs-nfs3', version), sudo=True,)
self.assertNoMoreResources()
http://git-wip-us.apache.org/repos/asf/ambari/blob/15bdb771/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 bca4034..65be780 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
@@ -206,7 +206,7 @@ class TestHiveClient(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None), (0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None, ''), (0, None, ''), (0, None, '')],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute',
http://git-wip-us.apache.org/repos/asf/ambari/blob/15bdb771/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 747a25d..ffb8346 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
@@ -936,7 +936,7 @@ From source with checksum 150f554beae04f76f814f59549dead8b"""
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None, '')],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute',
http://git-wip-us.apache.org/repos/asf/ambari/blob/15bdb771/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 deb89e5..516df5e 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
@@ -377,7 +377,7 @@ class TestWebHCatServer(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None, '')],
mocks_dict = mocks_dict)
self.assertTrue("params" in sys.modules)
http://git-wip-us.apache.org/repos/asf/ambari/blob/15bdb771/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 9e3106f..5a5ebfe 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
@@ -230,7 +230,7 @@ class TestOozieClient(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute',
http://git-wip-us.apache.org/repos/asf/ambari/blob/15bdb771/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 9c2efe6..108f6c4 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
@@ -1220,7 +1220,7 @@ class TestOozieServer(RMFTestCase):
classname = "OozieServer", command = "pre_upgrade_restart", config_dict = json_content,
hdp_stack_version = self.UPGRADE_STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, prepare_war_stdout)],
+ call_mocks = [(0, None, ''), (0, prepare_war_stdout)],
mocks_dict = mocks_dict)
self.assertTrue(isfile_mock.called)
@@ -1474,7 +1474,7 @@ class TestOozieServer(RMFTestCase):
classname = "OozieServer", command = "pre_upgrade_restart", config_dict = json_content,
hdp_stack_version = self.UPGRADE_STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, prepare_war_stdout)],
+ call_mocks = [(0, None, ''), (0, prepare_war_stdout)],
mocks_dict = mocks_dict)
self.assertTrue(isfile_mock.called)
http://git-wip-us.apache.org/repos/asf/ambari/blob/15bdb771/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 dc24706..b77b22c 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
@@ -163,7 +163,7 @@ class TestPigClient(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None, '')],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute',
http://git-wip-us.apache.org/repos/asf/ambari/blob/15bdb771/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 765aba3..d47d67c 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
@@ -126,7 +126,7 @@ class TestSqoop(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled("Execute", ('hdp-select', 'set', 'sqoop-client', version), sudo=True)
http://git-wip-us.apache.org/repos/asf/ambari/blob/15bdb771/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 dd02fdf..1103d33 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
@@ -803,7 +803,7 @@ class TestHistoryServer(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hadoop-mapreduce-historyserver', version), sudo=True)
http://git-wip-us.apache.org/repos/asf/ambari/blob/15bdb771/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 f10f4eb..2c47fbc 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
@@ -403,7 +403,7 @@ class TestMapReduce2Client(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hadoop-client', version), sudo=True)
http://git-wip-us.apache.org/repos/asf/ambari/blob/15bdb771/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 4bc5746..f53fb53 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
@@ -719,7 +719,7 @@ class TestNodeManager(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hadoop-yarn-nodemanager', version), sudo=True)
http://git-wip-us.apache.org/repos/asf/ambari/blob/15bdb771/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 175ca03..e46dc97 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
@@ -633,7 +633,7 @@ class TestResourceManager(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hadoop-yarn-resourcemanager', version), sudo=True)
http://git-wip-us.apache.org/repos/asf/ambari/blob/15bdb771/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 f89f576..30bf402 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
@@ -573,7 +573,7 @@ class TestYarnClient(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hadoop-client', version), sudo=True)
http://git-wip-us.apache.org/repos/asf/ambari/blob/15bdb771/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 a77b25d..986072c 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
@@ -193,7 +193,7 @@ class TestZookeeperClient(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute',
http://git-wip-us.apache.org/repos/asf/ambari/blob/15bdb771/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 5cc5760..9e889d1 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
@@ -379,7 +379,7 @@ class TestZookeeperServer(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute',
http://git-wip-us.apache.org/repos/asf/ambari/blob/15bdb771/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 1a7de71..5e244e8 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
@@ -140,7 +140,7 @@ class TestFalconClient(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute',
http://git-wip-us.apache.org/repos/asf/ambari/blob/15bdb771/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 ea8c859..7c8391e 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
@@ -529,7 +529,7 @@ class TestFalconServer(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute',
http://git-wip-us.apache.org/repos/asf/ambari/blob/15bdb771/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 b3760ad..42f9344 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
@@ -517,7 +517,7 @@ class TestHiveMetastore(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute',
@@ -602,7 +602,7 @@ class TestHiveMetastore(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
# we don't care about configure here - the strings are different anyway because this
@@ -687,7 +687,7 @@ class TestHiveMetastore(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
# we don't care about configure here - the strings are different anyway because this
http://git-wip-us.apache.org/repos/asf/ambari/blob/15bdb771/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 1bedadd..d382b9e 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
@@ -173,7 +173,7 @@ class TestStormDrpcServer(TestStormBase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-client', '2.3.0.0-1234'), sudo=True)
http://git-wip-us.apache.org/repos/asf/ambari/blob/15bdb771/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 13340ef..1952028 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
@@ -172,7 +172,7 @@ class TestStormNimbus(TestStormBase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-client', '2.3.0.0-1234'), sudo=True)
http://git-wip-us.apache.org/repos/asf/ambari/blob/15bdb771/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 4ee8d22..c6480fb 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
@@ -137,7 +137,7 @@ class TestStormNimbus(TestStormBase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None, '')],
mocks_dict = mocks_dict)
self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-client', '2.3.0.0-1234'), sudo=True)
http://git-wip-us.apache.org/repos/asf/ambari/blob/15bdb771/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 549571b..d5cd00f 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
@@ -218,7 +218,7 @@ class TestStormSupervisor(TestStormBase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-client', '2.3.0.0-1234'), sudo=True)
http://git-wip-us.apache.org/repos/asf/ambari/blob/15bdb771/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 c21a81a..601c337 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
@@ -187,7 +187,7 @@ class TestStormSupervisor(TestStormBase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-client', '2.3.0.0-1234'), sudo=True)
http://git-wip-us.apache.org/repos/asf/ambari/blob/15bdb771/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 abbbab4..fb2e884 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
@@ -171,7 +171,7 @@ class TestStormUiServer(TestStormBase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-client', '2.3.0.0-1234'), sudo=True)
http://git-wip-us.apache.org/repos/asf/ambari/blob/15bdb771/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 59fedc4..975cdfb 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
@@ -105,7 +105,7 @@ class TestTezClient(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None), (0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None, ''), (0, None, ''), (0, None, '')],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hadoop-client', version), sudo=True)
http://git-wip-us.apache.org/repos/asf/ambari/blob/15bdb771/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 c5fb89c..f8e4504 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
@@ -405,7 +405,7 @@ class TestAppTimelineServer(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None, '')],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hadoop-yarn-timelineserver', version), sudo=True)
http://git-wip-us.apache.org/repos/asf/ambari/blob/15bdb771/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 37a5600..7f0e721 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
@@ -62,7 +62,7 @@ class TestAccumuloClient(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute', ('hdp-select', 'set', 'accumulo-client', version), sudo=True,)
http://git-wip-us.apache.org/repos/asf/ambari/blob/15bdb771/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 ea319f7..9d51c76 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
@@ -128,7 +128,7 @@ class TestKafkaBroker(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute',
http://git-wip-us.apache.org/repos/asf/ambari/blob/15bdb771/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 082aa2c..96ca7a4 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
@@ -287,7 +287,7 @@ class TestKnoxGateway(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute', ('tar',
@@ -359,7 +359,7 @@ class TestKnoxGateway(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute', ('tar',
@@ -431,7 +431,7 @@ class TestKnoxGateway(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute', ('tar',
http://git-wip-us.apache.org/repos/asf/ambari/blob/15bdb771/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 66a20a8..93692bc 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
@@ -205,7 +205,7 @@ class TestRangerAdmin(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled("Execute", ('hdp-select', 'set', 'ranger-admin', '2.3.0.0-1234'), sudo=True)
http://git-wip-us.apache.org/repos/asf/ambari/blob/15bdb771/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 4948ac7..0cd29b3 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
@@ -138,7 +138,7 @@ class TestRangerUsersync(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertTrue(setup_usersync_mock.called)
http://git-wip-us.apache.org/repos/asf/ambari/blob/15bdb771/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 11fb429..bd99241 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
@@ -137,7 +137,7 @@ class TestSliderClient(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None), (0, None), (0, None)],
+ 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'), sudo=True)
http://git-wip-us.apache.org/repos/asf/ambari/blob/15bdb771/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 bc34623..4fdbd12 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
@@ -286,7 +286,7 @@ class TestJobHistoryServer(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute', ('hdp-select', 'set', 'spark-historyserver', version), sudo=True)
http://git-wip-us.apache.org/repos/asf/ambari/blob/15bdb771/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 e611acb..23f94d0 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
@@ -130,7 +130,7 @@ class TestSparkClient(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute', ('hdp-select', 'set', 'spark-client', version), sudo=True)
http://git-wip-us.apache.org/repos/asf/ambari/blob/15bdb771/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 867acc9..f555f37 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
@@ -97,7 +97,7 @@ class TestMahoutClient(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = itertools.cycle([(0, None)]),
+ call_mocks = itertools.cycle([(0, None, '')]),
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute', ('hdp-select', 'set', 'mahout-client', '2.3.0.0-1234'),
http://git-wip-us.apache.org/repos/asf/ambari/blob/15bdb771/ambari-server/src/test/python/stacks/2.3/SPARK/test_spark_thrift_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.3/SPARK/test_spark_thrift_server.py b/ambari-server/src/test/python/stacks/2.3/SPARK/test_spark_thrift_server.py
index f26ea31..a8359cf 100644
--- a/ambari-server/src/test/python/stacks/2.3/SPARK/test_spark_thrift_server.py
+++ b/ambari-server/src/test/python/stacks/2.3/SPARK/test_spark_thrift_server.py
@@ -157,7 +157,7 @@ class TestSparkThriftServer(RMFTestCase):
config_dict = json_content,
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
- call_mocks = [(0, None), (0, None)],
+ call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute', ('hdp-select', 'set', 'spark-thriftserver', version), sudo=True)