http://git-wip-us.apache.org/repos/asf/ambari/blob/df2dbe15/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 185db68..69e1f5d 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 @@ -60,6 +60,7 @@ class TestHistoryServer(RMFTestCase): self.assertResourceCalled("HdfsResource", "/apps/tez/", type="directory", action=["create_on_execute"], + hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', user=u"hdfs", dfs_type = '', owner=u"tez", @@ -77,6 +78,7 @@ class TestHistoryServer(RMFTestCase): self.assertResourceCalled("HdfsResource", "/apps/tez/lib/", type="directory", action=["create_on_execute"], + hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', user=u'hdfs', owner=u"tez", dfs_type = '', @@ -93,6 +95,7 @@ class TestHistoryServer(RMFTestCase): self.assertResourceCalled("HdfsResource", None, action=['execute'], + hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', user=u'hdfs', hadoop_bin_dir="/usr/bin", dfs_type = '', @@ -205,7 +208,7 @@ class TestHistoryServer(RMFTestCase): group = 'hadoop', hadoop_bin_dir = '/usr/bin', type = 'directory', - action = ['create_on_execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020', + action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020', mode = 0777, ) self.assertResourceCalled('HdfsResource', '/tmp/entity-file-history/active', @@ -222,7 +225,7 @@ class TestHistoryServer(RMFTestCase): group = 'hadoop', hadoop_conf_dir = '/etc/hadoop/conf', type = 'directory', - action = ['create_on_execute'], + action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', ) self.assertResourceCalled('HdfsResource', '/mapred', security_enabled = False, @@ -234,7 +237,7 @@ class TestHistoryServer(RMFTestCase): owner = 'mapred', hadoop_conf_dir = '/etc/hadoop/conf', type = 'directory', - action = ['create_on_execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020', + action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020', ) self.assertResourceCalled('HdfsResource', '/mapred/system', security_enabled = False, @@ -246,7 +249,7 @@ class TestHistoryServer(RMFTestCase): owner = 'hdfs', hadoop_conf_dir = '/etc/hadoop/conf', type = 'directory', - action = ['create_on_execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020', + action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020', ) self.assertResourceCalled('HdfsResource', '/mr-history/done', security_enabled = False, @@ -260,7 +263,7 @@ class TestHistoryServer(RMFTestCase): group = 'hadoop', hadoop_bin_dir = '/usr/bin', type = 'directory', - action = ['create_on_execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020', + action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020', mode = 0777, ) self.assertResourceCalled('HdfsResource', None, @@ -270,7 +273,7 @@ class TestHistoryServer(RMFTestCase): kinit_path_local = '/usr/bin/kinit', user = 'hdfs', dfs_type = '', - action = ['execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020', + action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020', hadoop_conf_dir = '/etc/hadoop/conf', ) self.assertResourceCalled('Directory', '/hadoop/mapreduce/jhs', @@ -451,7 +454,7 @@ class TestHistoryServer(RMFTestCase): group = 'hadoop', hadoop_bin_dir = '/usr/bin', type = 'directory', - action = ['create_on_execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name='hdfs', default_fs='hdfs://c6401.ambari.apache.org:8020', + action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name='hdfs', default_fs='hdfs://c6401.ambari.apache.org:8020', mode = 0777, ) self.assertResourceCalled('HdfsResource', '/tmp/entity-file-history/active', @@ -468,7 +471,7 @@ class TestHistoryServer(RMFTestCase): group = 'hadoop', hadoop_conf_dir = '/etc/hadoop/conf', type = 'directory', - action = ['create_on_execute'], + action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', ) self.assertResourceCalled('HdfsResource', '/mapred', security_enabled = True, @@ -480,7 +483,7 @@ class TestHistoryServer(RMFTestCase): owner = 'mapred', hadoop_conf_dir = '/etc/hadoop/conf', type = 'directory', - action = ['create_on_execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name='hdfs', default_fs='hdfs://c6401.ambari.apache.org:8020', + action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name='hdfs', default_fs='hdfs://c6401.ambari.apache.org:8020', ) self.assertResourceCalled('HdfsResource', '/mapred/system', security_enabled = True, @@ -492,7 +495,7 @@ class TestHistoryServer(RMFTestCase): owner = 'hdfs', hadoop_conf_dir = '/etc/hadoop/conf', type = 'directory', - action = ['create_on_execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name='hdfs', default_fs='hdfs://c6401.ambari.apache.org:8020', + action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name='hdfs', default_fs='hdfs://c6401.ambari.apache.org:8020', ) self.assertResourceCalled('HdfsResource', '/mr-history/done', security_enabled = True, @@ -506,7 +509,7 @@ class TestHistoryServer(RMFTestCase): group = 'hadoop', hadoop_bin_dir = '/usr/bin', type = 'directory', - action = ['create_on_execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name='hdfs', default_fs='hdfs://c6401.ambari.apache.org:8020', + action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name='hdfs', default_fs='hdfs://c6401.ambari.apache.org:8020', mode = 0777, ) self.assertResourceCalled('HdfsResource', None, @@ -516,7 +519,7 @@ class TestHistoryServer(RMFTestCase): kinit_path_local = '/usr/bin/kinit', user = 'hdfs', dfs_type = '', - action = ['execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name='hdfs', default_fs='hdfs://c6401.ambari.apache.org:8020', + action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name='hdfs', default_fs='hdfs://c6401.ambari.apache.org:8020', hadoop_conf_dir = '/etc/hadoop/conf', ) self.assertResourceCalled('Directory', '/hadoop/mapreduce/jhs', @@ -841,7 +844,7 @@ class TestHistoryServer(RMFTestCase): kinit_path_local = '/usr/bin/kinit', user = 'hdfs', dfs_type = '', - action = ['execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020', + action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020', hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', )
http://git-wip-us.apache.org/repos/asf/ambari/blob/df2dbe15/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_service_check.py b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_service_check.py index 54ecf33..3618ab8 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_service_check.py +++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_service_check.py @@ -46,7 +46,7 @@ class TestServiceCheck(RMFTestCase): kinit_path_local = '/usr/bin/kinit', user = 'hdfs', dfs_type = '', - action = ['delete_on_execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020', + action = ['delete_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020', hadoop_conf_dir = '/etc/hadoop/conf', type = 'directory', ) @@ -58,7 +58,7 @@ class TestServiceCheck(RMFTestCase): source = '/etc/passwd', user = 'hdfs', dfs_type = '', - action = ['create_on_execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020', + action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020', hadoop_conf_dir = '/etc/hadoop/conf', type = 'file', ) @@ -69,7 +69,7 @@ class TestServiceCheck(RMFTestCase): kinit_path_local = '/usr/bin/kinit', user = 'hdfs', dfs_type = '', - action = ['execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020', + action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020', hadoop_conf_dir = '/etc/hadoop/conf', ) self.assertResourceCalled('ExecuteHadoop', 'jar /usr/lib/hadoop-mapreduce/hadoop-mapreduce-examples-2.*.jar wordcount /user/ambari-qa/mapredsmokeinput /user/ambari-qa/mapredsmokeoutput', @@ -103,7 +103,7 @@ class TestServiceCheck(RMFTestCase): kinit_path_local = '/usr/bin/kinit', user = 'hdfs', dfs_type = '', - action = ['delete_on_execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name='hdfs', default_fs='hdfs://c6401.ambari.apache.org:8020', + action = ['delete_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name='hdfs', default_fs='hdfs://c6401.ambari.apache.org:8020', hadoop_conf_dir = '/etc/hadoop/conf', type = 'directory', ) @@ -115,7 +115,7 @@ class TestServiceCheck(RMFTestCase): source = '/etc/passwd', user = 'hdfs', dfs_type = '', - action = ['create_on_execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name='hdfs', default_fs='hdfs://c6401.ambari.apache.org:8020', + action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name='hdfs', default_fs='hdfs://c6401.ambari.apache.org:8020', hadoop_conf_dir = '/etc/hadoop/conf', type = 'file', ) @@ -126,7 +126,7 @@ class TestServiceCheck(RMFTestCase): kinit_path_local = '/usr/bin/kinit', user = 'hdfs', dfs_type = '', - action = ['execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name='hdfs', default_fs='hdfs://c6401.ambari.apache.org:8020', + action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name='hdfs', default_fs='hdfs://c6401.ambari.apache.org:8020', hadoop_conf_dir = '/etc/hadoop/conf', ) self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab ambari...@example.com;', http://git-wip-us.apache.org/repos/asf/ambari/blob/df2dbe15/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 b14a527..10c721f 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 @@ -141,7 +141,7 @@ class TestFalconServer(RMFTestCase): owner = 'falcon', hadoop_conf_dir = '/etc/hadoop/conf', type = 'directory', - action = ['create_on_execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020', + action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020', mode = 0777, ) self.assertResourceCalled('Directory', '/hadoop/falcon/store', @@ -161,7 +161,7 @@ class TestFalconServer(RMFTestCase): type = 'directory', recursive_chown = True, recursive_chmod = True, - action = ['create_on_execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020', + action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020', mode = 0770, source='/usr/hdp/current/falcon-server/data-mirroring' ) @@ -173,7 +173,7 @@ class TestFalconServer(RMFTestCase): kinit_path_local = '/usr/bin/kinit', user = 'hdfs', dfs_type = '', - action = ['execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020', + action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020', hadoop_conf_dir = '/etc/hadoop/conf', ) self.assertResourceCalled('Directory', '/hadoop/falcon', @@ -327,7 +327,7 @@ class TestFalconServer(RMFTestCase): owner = 'falcon', hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', type = 'directory', - action = ['create_on_execute'], + action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', mode = 0777, ) self.assertResourceCalled('Directory', '/hadoop/falcon/store', @@ -351,7 +351,7 @@ class TestFalconServer(RMFTestCase): group = 'users', hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', type = 'directory', - action = ['create_on_execute'], + action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', mode = 0770, ) self.assertResourceCalled('HdfsResource', None, @@ -364,7 +364,7 @@ class TestFalconServer(RMFTestCase): principal_name = UnknownConfigurationMock(), user = 'hdfs', dfs_type = '', - action = ['execute'], + action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', ) self.assertResourceCalled('Directory', '/hadoop/falcon', http://git-wip-us.apache.org/repos/asf/ambari/blob/df2dbe15/ambari-server/src/test/python/stacks/2.1/TEZ/test_service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/TEZ/test_service_check.py b/ambari-server/src/test/python/stacks/2.1/TEZ/test_service_check.py index 728a1a8..399d1e2 100644 --- a/ambari-server/src/test/python/stacks/2.1/TEZ/test_service_check.py +++ b/ambari-server/src/test/python/stacks/2.1/TEZ/test_service_check.py @@ -47,7 +47,7 @@ class TestTezServiceCheck(RMFTestCase): dfs_type = '', hadoop_conf_dir = '/etc/hadoop/conf', type = 'directory', - action = ['delete_on_execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020', + action = ['delete_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020', ) self.assertResourceCalled('HdfsResource', '/tmp/tezsmokeinput', @@ -60,7 +60,7 @@ class TestTezServiceCheck(RMFTestCase): owner = 'ambari-qa', hadoop_conf_dir = '/etc/hadoop/conf', type = 'directory', - action = ['create_on_execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020', + action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020', ) self.assertResourceCalled('HdfsResource', '/tmp/tezsmokeinput/sample-tez-test', security_enabled = False, @@ -73,7 +73,7 @@ class TestTezServiceCheck(RMFTestCase): owner = 'ambari-qa', hadoop_conf_dir = '/etc/hadoop/conf', type = 'file', - action = ['create_on_execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020', + action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020', ) self.assertResourceCalled('HdfsResource', None, security_enabled = False, @@ -82,7 +82,7 @@ class TestTezServiceCheck(RMFTestCase): kinit_path_local = '/usr/bin/kinit', user = 'hdfs', dfs_type = '', - action = ['execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020', + action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020', hadoop_conf_dir = '/etc/hadoop/conf', ) self.assertResourceCalled('ExecuteHadoop', 'jar /usr/lib/tez/tez-mapreduce-examples*.jar orderedwordcount /tmp/tezsmokeinput/sample-tez-test /tmp/tezsmokeoutput/', @@ -125,7 +125,7 @@ class TestTezServiceCheck(RMFTestCase): kinit_path_local = '/usr/bin/kinit', principal_name = 'hdfs', user = 'hdfs', - action = ['delete_on_execute'], + action = ['delete_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hadoop_conf_dir = '/etc/hadoop/conf', type = 'directory', ) @@ -142,7 +142,7 @@ class TestTezServiceCheck(RMFTestCase): owner = 'ambari-qa', hadoop_conf_dir = '/etc/hadoop/conf', type = 'directory', - action = ['create_on_execute'], + action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', ) self.assertResourceCalled('HdfsResource', '/tmp/tezsmokeinput/sample-tez-test', security_enabled = True, @@ -158,7 +158,7 @@ class TestTezServiceCheck(RMFTestCase): owner = 'ambari-qa', hadoop_conf_dir = '/etc/hadoop/conf', type = 'file', - action = ['create_on_execute'], + action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', ) self.assertResourceCalled('HdfsResource', None, security_enabled = True, @@ -170,7 +170,7 @@ class TestTezServiceCheck(RMFTestCase): kinit_path_local = '/usr/bin/kinit', principal_name = 'hdfs', user = 'hdfs', - action = ['execute'], + action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hadoop_conf_dir = '/etc/hadoop/conf', ) self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab ambari...@example.com;', http://git-wip-us.apache.org/repos/asf/ambari/blob/df2dbe15/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 4fccd91..4af5f83 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 @@ -197,7 +197,7 @@ class TestAppTimelineServer(RMFTestCase): kinit_path_local = '/usr/bin/kinit', principal_name = UnknownConfigurationMock(), user = 'hdfs', - action = ['execute'], + action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hadoop_conf_dir = '/etc/hadoop/conf', ) self.assertResourceCalled('File', '/etc/hadoop/conf/yarn.exclude', http://git-wip-us.apache.org/repos/asf/ambari/blob/df2dbe15/ambari-server/src/test/python/stacks/2.2/PIG/test_pig_service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/PIG/test_pig_service_check.py b/ambari-server/src/test/python/stacks/2.2/PIG/test_pig_service_check.py index bf42f9b..bfc8f31 100644 --- a/ambari-server/src/test/python/stacks/2.2/PIG/test_pig_service_check.py +++ b/ambari-server/src/test/python/stacks/2.2/PIG/test_pig_service_check.py @@ -50,7 +50,7 @@ class TestPigServiceCheck(RMFTestCase): owner = 'ambari-qa', hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', type = 'directory', - action = ['delete_on_execute'], + action = ['delete_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', ) self.assertResourceCalled('HdfsResource', '/user/ambari-qa/passwd', security_enabled = True, @@ -66,7 +66,7 @@ class TestPigServiceCheck(RMFTestCase): owner = 'ambari-qa', hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', type = 'file', - action = ['create_on_execute'], + action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', ) self.assertResourceCalled('HdfsResource', None, security_enabled = True, @@ -78,7 +78,7 @@ class TestPigServiceCheck(RMFTestCase): principal_name = 'h...@example.com', user = 'hdfs', dfs_type = '', - action = ['execute'], + action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', ) self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab ambari...@example.com;', @@ -113,7 +113,7 @@ class TestPigServiceCheck(RMFTestCase): owner = 'ambari-qa', hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', type = 'directory', - action = ['delete_on_execute'], + action = ['delete_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', ) self.assertResourceCalled('HdfsResource', '/user/ambari-qa/passwd', security_enabled = True, @@ -129,7 +129,7 @@ class TestPigServiceCheck(RMFTestCase): owner = 'ambari-qa', hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', type = 'file', - action = ['create_on_execute'], + action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', ) copy_to_hdfs_mock.assert_called_with("tez", "hadoop", "hdfs", host_sys_prepped=False) @@ -143,7 +143,7 @@ class TestPigServiceCheck(RMFTestCase): principal_name = 'h...@example.com', user = 'hdfs', dfs_type = '', - action = ['execute'], + action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', ) http://git-wip-us.apache.org/repos/asf/ambari/blob/df2dbe15/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 f7cd3b5..73322a1 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 @@ -63,7 +63,7 @@ class TestJobHistoryServer(RMFTestCase): principal_name = UnknownConfigurationMock(), user = 'hdfs', dfs_type = '', - action = ['execute'], + action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', ) self.assertResourceCalled('Execute', '/usr/hdp/current/spark-client/sbin/start-history-server.sh', @@ -118,6 +118,7 @@ class TestJobHistoryServer(RMFTestCase): self.assertResourceCalled('HdfsResource', None, action=['execute'], + hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', default_fs= UnknownConfigurationMock(), hadoop_bin_dir='/usr/hdp/current/hadoop-client/bin', hadoop_conf_dir='/usr/hdp/current/hadoop-client/conf', @@ -180,7 +181,7 @@ class TestJobHistoryServer(RMFTestCase): owner = 'spark', hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', type = 'directory', - action = ['create_on_execute'], + action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', mode = 0775, ) self.assertResourceCalled('HdfsResource', None, @@ -193,7 +194,7 @@ class TestJobHistoryServer(RMFTestCase): principal_name = UnknownConfigurationMock(), user = 'hdfs', dfs_type = '', - action = ['execute'], + action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', ) self.assertResourceCalled('PropertiesFile', '/usr/hdp/current/spark-client/conf/spark-defaults.conf', @@ -251,7 +252,7 @@ class TestJobHistoryServer(RMFTestCase): hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', dfs_type = '', type = 'directory', - action = ['create_on_execute'], + action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', mode = 0775, ) self.assertResourceCalled('HdfsResource', None, @@ -264,7 +265,7 @@ class TestJobHistoryServer(RMFTestCase): principal_name = UnknownConfigurationMock(), user = UnknownConfigurationMock(), dfs_type = '', - action = ['execute'], + action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', ) self.assertResourceCalled('PropertiesFile', '/usr/hdp/current/spark-client/conf/spark-defaults.conf', http://git-wip-us.apache.org/repos/asf/ambari/blob/df2dbe15/ambari-server/src/test/python/stacks/2.3/MAHOUT/test_mahout_service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/MAHOUT/test_mahout_service_check.py b/ambari-server/src/test/python/stacks/2.3/MAHOUT/test_mahout_service_check.py index c9f376b..878b7f8 100644 --- a/ambari-server/src/test/python/stacks/2.3/MAHOUT/test_mahout_service_check.py +++ b/ambari-server/src/test/python/stacks/2.3/MAHOUT/test_mahout_service_check.py @@ -47,7 +47,7 @@ class TestMahoutClient(RMFTestCase): kinit_path_local = '/usr/bin/kinit', user = 'hdfs', dfs_type = '', - action = ['delete_on_execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020', + action = ['delete_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020', hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', type = 'directory', ) @@ -61,7 +61,7 @@ class TestMahoutClient(RMFTestCase): owner = 'ambari-qa', hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', type = 'directory', - action = ['create_on_execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020', + action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020', ) self.assertResourceCalled('HdfsResource', '/user/ambari-qa/mahoutsmokeinput/sample-mahout-test.txt', security_enabled = False, @@ -74,7 +74,7 @@ class TestMahoutClient(RMFTestCase): owner = 'ambari-qa', hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', type = 'file', - action = ['create_on_execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020', + action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020', ) self.assertResourceCalled('HdfsResource', None, security_enabled = False, @@ -83,7 +83,7 @@ class TestMahoutClient(RMFTestCase): kinit_path_local = '/usr/bin/kinit', user = 'hdfs', dfs_type = '', - action = ['execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020', + action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020', hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', ) self.assertResourceCalled('Execute', 'mahout seqdirectory --input /user/ambari-qa/mahoutsmokeinput/' http://git-wip-us.apache.org/repos/asf/ambari/blob/df2dbe15/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 8e7d367..f9c741d 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 @@ -102,7 +102,7 @@ class TestSparkThriftServer(RMFTestCase): owner = 'spark', hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', type = 'directory', - action = ['create_on_execute'], + action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', dfs_type = '', mode = 0775, ) @@ -115,7 +115,7 @@ class TestSparkThriftServer(RMFTestCase): kinit_path_local = '/usr/bin/kinit', principal_name = UnknownConfigurationMock(), user = 'hdfs', - action = ['execute'], + action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', dfs_type = '', hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', ) http://git-wip-us.apache.org/repos/asf/ambari/blob/df2dbe15/ambari-server/src/test/python/stacks/2.3/YARN/test_ats_1_5.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/YARN/test_ats_1_5.py b/ambari-server/src/test/python/stacks/2.3/YARN/test_ats_1_5.py index 0b3d434..f826b55 100644 --- a/ambari-server/src/test/python/stacks/2.3/YARN/test_ats_1_5.py +++ b/ambari-server/src/test/python/stacks/2.3/YARN/test_ats_1_5.py @@ -165,7 +165,7 @@ class TestAts(RMFTestCase): group = 'hadoop', hadoop_conf_dir = '/etc/hadoop/conf', type = 'directory', - action = ['create_on_execute'], + action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', mode = 0755, ) self.assertResourceCalled('HdfsResource', '/ats/done', @@ -182,7 +182,7 @@ class TestAts(RMFTestCase): group = 'hadoop', hadoop_conf_dir = '/etc/hadoop/conf', type = 'directory', - action = ['create_on_execute'], + action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', mode = 0700, ) self.assertResourceCalled('HdfsResource', '/ats', @@ -200,7 +200,7 @@ class TestAts(RMFTestCase): group = 'hadoop', hadoop_conf_dir = '/etc/hadoop/conf', type = 'directory', - action = ['create_on_execute'], + action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', mode = 0755, ) self.assertResourceCalled('HdfsResource', '/ats/active', @@ -217,7 +217,7 @@ class TestAts(RMFTestCase): group = 'hadoop', hadoop_conf_dir = '/etc/hadoop/conf', type = 'directory', - action = ['create_on_execute'], + action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', mode = 01777, ) self.assertResourceCalled('HdfsResource', None, @@ -230,7 +230,7 @@ class TestAts(RMFTestCase): kinit_path_local = '/usr/bin/kinit', principal_name = UnknownConfigurationMock(), user = 'hdfs', - action = ['execute'], + action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hadoop_conf_dir = '/etc/hadoop/conf', ) self.assertResourceCalled('File', '/etc/hadoop/conf/yarn.exclude',
