Repository: ambari Updated Branches: refs/heads/branch-2.2 878ae1599 -> ad5ecf826
http://git-wip-us.apache.org/repos/asf/ambari/blob/ad5ecf82/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 ff83149..3ff4d73 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 @@ -59,7 +59,7 @@ class TestHistoryServer(RMFTestCase): self.assertResourceCalled("HdfsResource", "/apps/tez/", type="directory", - action=["create_on_execute"], + action=["create_on_execute"], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', user=u"hdfs", owner=u"tez", mode=493, @@ -75,7 +75,7 @@ class TestHistoryServer(RMFTestCase): self.assertResourceCalled("HdfsResource", "/apps/tez/lib/", type="directory", - action=["create_on_execute"], + action=["create_on_execute"], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', user=u'hdfs', owner=u"tez", mode=493, @@ -90,7 +90,7 @@ class TestHistoryServer(RMFTestCase): ) self.assertResourceCalled("HdfsResource", None, - action=['execute'], + action=['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', user=u'hdfs', hadoop_bin_dir="/usr/bin", hadoop_conf_dir="/etc/hadoop/conf", @@ -201,7 +201,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', @@ -217,7 +217,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, @@ -228,7 +228,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, @@ -239,7 +239,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, @@ -252,7 +252,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, @@ -261,7 +261,7 @@ class TestHistoryServer(RMFTestCase): keytab = UnknownConfigurationMock(), kinit_path_local = '/usr/bin/kinit', user = 'hdfs', - 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', @@ -443,7 +443,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', @@ -459,7 +459,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, @@ -470,7 +470,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, @@ -481,7 +481,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, @@ -494,7 +494,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, @@ -503,7 +503,7 @@ class TestHistoryServer(RMFTestCase): keytab = '/etc/security/keytabs/hdfs.headless.keytab', kinit_path_local = '/usr/bin/kinit', user = 'hdfs', - 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', @@ -831,7 +831,7 @@ class TestHistoryServer(RMFTestCase): keytab = UnknownConfigurationMock(), kinit_path_local = '/usr/bin/kinit', user = 'hdfs', - 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/ad5ecf82/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 d80862b..8056aae 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 @@ -45,7 +45,7 @@ class TestServiceCheck(RMFTestCase): keytab = UnknownConfigurationMock(), kinit_path_local = '/usr/bin/kinit', user = 'hdfs', - 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', ) @@ -56,7 +56,7 @@ class TestServiceCheck(RMFTestCase): kinit_path_local = '/usr/bin/kinit', source = '/etc/passwd', user = 'hdfs', - 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', ) @@ -66,7 +66,7 @@ class TestServiceCheck(RMFTestCase): keytab = UnknownConfigurationMock(), kinit_path_local = '/usr/bin/kinit', user = 'hdfs', - 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', @@ -99,7 +99,7 @@ class TestServiceCheck(RMFTestCase): keytab = '/etc/security/keytabs/hdfs.headless.keytab', kinit_path_local = '/usr/bin/kinit', user = 'hdfs', - 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', ) @@ -110,7 +110,7 @@ class TestServiceCheck(RMFTestCase): kinit_path_local = '/usr/bin/kinit', source = '/etc/passwd', user = 'hdfs', - 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', ) @@ -120,7 +120,7 @@ class TestServiceCheck(RMFTestCase): keytab = '/etc/security/keytabs/hdfs.headless.keytab', kinit_path_local = '/usr/bin/kinit', user = 'hdfs', - 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/ad5ecf82/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 e5f8d2c..36b0b3a 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 @@ -140,7 +140,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', @@ -159,7 +159,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' ) @@ -170,7 +170,7 @@ class TestFalconServer(RMFTestCase): keytab = UnknownConfigurationMock(), kinit_path_local = '/usr/bin/kinit', user = 'hdfs', - 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', @@ -323,7 +323,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', @@ -346,7 +346,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, @@ -358,7 +358,7 @@ class TestFalconServer(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 = '/usr/hdp/current/hadoop-client/conf', ) self.assertResourceCalled('Directory', '/hadoop/falcon', http://git-wip-us.apache.org/repos/asf/ambari/blob/ad5ecf82/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 22b4ef8..a60a6a6 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 @@ -46,7 +46,7 @@ class TestTezServiceCheck(RMFTestCase): user = 'hdfs', 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', @@ -58,7 +58,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, @@ -70,7 +70,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, @@ -78,7 +78,7 @@ class TestTezServiceCheck(RMFTestCase): keytab = UnknownConfigurationMock(), kinit_path_local = '/usr/bin/kinit', user = 'hdfs', - 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/', @@ -120,7 +120,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', ) @@ -136,7 +136,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, @@ -151,7 +151,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, @@ -162,7 +162,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/ad5ecf82/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 9ff56b8..ea0cfba 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 @@ -196,7 +196,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/ad5ecf82/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 410bf93..8e8cda4 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 @@ -49,7 +49,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, @@ -64,7 +64,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, @@ -75,7 +75,7 @@ class TestPigServiceCheck(RMFTestCase): kinit_path_local = '/usr/bin/kinit', principal_name = 'h...@example.com', user = 'hdfs', - 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;', @@ -109,7 +109,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, @@ -124,7 +124,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) @@ -137,7 +137,7 @@ class TestPigServiceCheck(RMFTestCase): kinit_path_local = '/usr/bin/kinit', principal_name = 'h...@example.com', user = 'hdfs', - 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/ad5ecf82/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 acb604d..74e4c24 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 @@ -59,7 +59,7 @@ class TestJobHistoryServer(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 = '/usr/hdp/current/hadoop-client/conf', ) self.assertResourceCalled('Execute', '/usr/hdp/current/spark-client/sbin/start-history-server.sh', @@ -113,7 +113,7 @@ class TestJobHistoryServer(RMFTestCase): ) self.assertResourceCalled('HdfsResource', None, - action=['execute'], + 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', @@ -174,7 +174,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, @@ -186,7 +186,7 @@ class TestJobHistoryServer(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 = '/usr/hdp/current/hadoop-client/conf', ) self.assertResourceCalled('PropertiesFile', '/usr/hdp/current/spark-client/conf/spark-defaults.conf', @@ -243,7 +243,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, @@ -255,7 +255,7 @@ class TestJobHistoryServer(RMFTestCase): kinit_path_local = '/usr/bin/kinit', principal_name = UnknownConfigurationMock(), user = UnknownConfigurationMock(), - 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/ad5ecf82/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 03d243c..cb7b13b 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 @@ -43,7 +43,7 @@ class TestMahoutClient(RMFTestCase): keytab = UnknownConfigurationMock(), kinit_path_local = '/usr/bin/kinit', user = 'hdfs', - 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', ) @@ -56,7 +56,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, @@ -68,7 +68,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, @@ -76,7 +76,7 @@ class TestMahoutClient(RMFTestCase): keytab = UnknownConfigurationMock(), kinit_path_local = '/usr/bin/kinit', user = 'hdfs', - 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/ad5ecf82/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 4570190..b8ac3f8 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', mode = 0775, ) self.assertResourceCalled('HdfsResource', None, @@ -114,7 +114,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', 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/ad5ecf82/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 7086dcd..90ae6c0 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 @@ -164,7 +164,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', @@ -180,7 +180,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', @@ -197,7 +197,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', @@ -213,7 +213,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, @@ -225,7 +225,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',
