http://git-wip-us.apache.org/repos/asf/ambari/blob/92c054b1/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 201443a..d9f0d2e 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 @@ -137,86 +137,85 @@ class TestNodeManager(RMFTestCase): self.assertNoMoreResources() def assert_configure_default(self): - self.assertResourceCalled('Directory', '/hadoop/yarn/local', + self.assertResourceCalled('Directory', '/hadoop/yarn/log', owner = 'yarn', group = 'hadoop', - mode = 0775, - recursive = True, + create_parents = True, ignore_failures = True, + mode = 0775, cd_access='a' ) - self.assertResourceCalled('Directory', '/hadoop/yarn/local1', + self.assertResourceCalled('Directory', '/hadoop/yarn/log1', owner = 'yarn', - recursive = True, group = 'hadoop', + create_parents = True, ignore_failures = True, mode = 0775, cd_access='a' ) - self.assertResourceCalled('Directory', '/hadoop/yarn/log', + self.assertResourceCalled('Directory', '/hadoop/yarn/local', owner = 'yarn', group = 'hadoop', - recursive = True, - ignore_failures = True, mode = 0775, - cd_access='a' + create_parents = True, + ignore_failures = True, + cd_access='a', + recursive_mode_flags = {'d': 'a+rwx', 'f': 'a+rw'}, ) - self.assertResourceCalled('Directory', '/hadoop/yarn/log1', + self.assertResourceCalled('Directory', '/hadoop/yarn/local1', owner = 'yarn', + create_parents = True, group = 'hadoop', - recursive = True, ignore_failures = True, mode = 0775, - cd_access='a' + cd_access='a', + recursive_mode_flags = {'d': 'a+rwx', 'f': 'a+rw'} ) - self.assertResourceCalled('Execute', ('chmod', '-R', '755', u'/hadoop/yarn/local', u'/hadoop/yarn/local1'), - sudo = True, - ) self.assertResourceCalled('Directory', '/var/run/hadoop-yarn', owner = 'yarn', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/run/hadoop-yarn/yarn', owner = 'yarn', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/log/hadoop-yarn/yarn', owner = 'yarn', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/run/hadoop-mapreduce', owner = 'mapred', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/run/hadoop-mapreduce/mapred', owner = 'mapred', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/log/hadoop-mapreduce', owner = 'mapred', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/log/hadoop-mapreduce/mapred', owner = 'mapred', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/log/hadoop-yarn', owner = 'yarn', - recursive = True, + create_parents = True, ignore_failures = True, cd_access = 'a', ) @@ -289,7 +288,7 @@ class TestNodeManager(RMFTestCase): ) self.assertResourceCalled('Directory', '/cgroups_test/cpu', group = 'hadoop', - recursive = True, + create_parents = True, mode = 0755, cd_access="a" ) @@ -340,70 +339,69 @@ class TestNodeManager(RMFTestCase): self.assertResourceCalled('File', '/var/lib/hadoop-yarn/nm_security_enabled', content= 'Marker file to track first start after enabling/disabling security. During first start yarn local, log dirs are removed and recreated' ) - self.assertResourceCalled('Directory', '/hadoop/yarn/local', + self.assertResourceCalled('Directory', '/hadoop/yarn/log', owner = 'yarn', group = 'hadoop', - recursive = True, + create_parents = True, ignore_failures = True, mode = 0775, - cd_access='a' + cd_access='a', + ) - self.assertResourceCalled('Directory', '/hadoop/yarn/log', + self.assertResourceCalled('Directory', '/hadoop/yarn/local', owner = 'yarn', group = 'hadoop', - recursive = True, + create_parents = True, ignore_failures = True, mode = 0775, - cd_access='a' + cd_access='a', + recursive_mode_flags = {'d': 'a+rwx', 'f': 'a+rw'}, ) - self.assertResourceCalled('Execute', ('chmod', '-R', '755', u'/hadoop/yarn/local'), - sudo = True, - ) self.assertResourceCalled('Directory', '/var/run/hadoop-yarn', owner = 'yarn', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/run/hadoop-yarn/yarn', owner = 'yarn', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/log/hadoop-yarn/yarn', owner = 'yarn', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/run/hadoop-mapreduce', owner = 'mapred', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/run/hadoop-mapreduce/mapred', owner = 'mapred', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/log/hadoop-mapreduce', owner = 'mapred', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/log/hadoop-mapreduce/mapred', owner = 'mapred', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/log/hadoop-yarn', owner = 'yarn', - recursive = True, + create_parents = True, ignore_failures = True, cd_access = 'a', ) @@ -476,7 +474,7 @@ class TestNodeManager(RMFTestCase): ) self.assertResourceCalled('Directory', '/cgroups_test/cpu', group = 'hadoop', - recursive = True, + create_parents = True, mode = 0755, cd_access="a" )
http://git-wip-us.apache.org/repos/asf/ambari/blob/92c054b1/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 610f98c..ee6cd3a 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 @@ -183,48 +183,48 @@ class TestResourceManager(RMFTestCase): self.assertResourceCalled('Directory', '/var/run/hadoop-yarn', owner = 'yarn', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/run/hadoop-yarn/yarn', owner = 'yarn', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/log/hadoop-yarn/yarn', owner = 'yarn', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/run/hadoop-mapreduce', owner = 'mapred', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/run/hadoop-mapreduce/mapred', owner = 'mapred', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/log/hadoop-mapreduce', owner = 'mapred', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/log/hadoop-mapreduce/mapred', owner = 'mapred', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/log/hadoop-yarn', owner = 'yarn', - recursive = True, + create_parents = True, ignore_failures = True, cd_access = 'a', ) @@ -301,7 +301,7 @@ class TestResourceManager(RMFTestCase): ) self.assertResourceCalled('Directory', '/cgroups_test/cpu', group = 'hadoop', - recursive = True, + create_parents = True, mode = 0755, cd_access="a" ) @@ -346,48 +346,48 @@ class TestResourceManager(RMFTestCase): self.assertResourceCalled('Directory', '/var/run/hadoop-yarn', owner = 'yarn', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/run/hadoop-yarn/yarn', owner = 'yarn', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/log/hadoop-yarn/yarn', owner = 'yarn', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/run/hadoop-mapreduce', owner = 'mapred', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/run/hadoop-mapreduce/mapred', owner = 'mapred', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/log/hadoop-mapreduce', owner = 'mapred', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/log/hadoop-mapreduce/mapred', owner = 'mapred', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/log/hadoop-yarn', owner = 'yarn', - recursive = True, + create_parents = True, ignore_failures = True, cd_access = 'a', ) @@ -464,7 +464,7 @@ class TestResourceManager(RMFTestCase): ) self.assertResourceCalled('Directory', '/cgroups_test/cpu', group = 'hadoop', - recursive = True, + create_parents = True, mode = 0755, cd_access="a" ) http://git-wip-us.apache.org/repos/asf/ambari/blob/92c054b1/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 199721e..be075bc 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 @@ -46,48 +46,48 @@ class TestYarnClient(RMFTestCase): self.assertResourceCalled('Directory', '/var/run/hadoop-yarn', owner = 'yarn', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/run/hadoop-yarn/yarn', owner = 'yarn', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/log/hadoop-yarn/yarn', owner = 'yarn', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/run/hadoop-mapreduce', owner = 'mapred', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/run/hadoop-mapreduce/mapred', owner = 'mapred', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/log/hadoop-mapreduce', owner = 'mapred', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/log/hadoop-mapreduce/mapred', owner = 'mapred', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/log/hadoop-yarn', owner = 'yarn', - recursive = True, + create_parents = True, ignore_failures = True, cd_access = 'a', ) @@ -160,7 +160,7 @@ class TestYarnClient(RMFTestCase): ) self.assertResourceCalled('Directory', '/cgroups_test/cpu', group = 'hadoop', - recursive = True, + create_parents = True, mode = 0755, cd_access="a" ) @@ -213,48 +213,48 @@ class TestYarnClient(RMFTestCase): self.assertResourceCalled('Directory', '/var/run/hadoop-yarn', owner = 'yarn', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/run/hadoop-yarn/yarn', owner = 'yarn', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/log/hadoop-yarn/yarn', owner = 'yarn', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/run/hadoop-mapreduce', owner = 'mapred', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/run/hadoop-mapreduce/mapred', owner = 'mapred', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/log/hadoop-mapreduce', owner = 'mapred', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/log/hadoop-mapreduce/mapred', owner = 'mapred', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/log/hadoop-yarn', owner = 'yarn', - recursive = True, + create_parents = True, ignore_failures = True, cd_access = 'a', ) @@ -327,7 +327,7 @@ class TestYarnClient(RMFTestCase): ) self.assertResourceCalled('Directory', '/cgroups_test/cpu', group = 'hadoop', - recursive = True, + create_parents = True, mode = 0755, cd_access="a" ) @@ -388,48 +388,48 @@ class TestYarnClient(RMFTestCase): self.assertResourceCalled('Directory', '/var/run/hadoop-yarn', owner = 'yarn', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/run/hadoop-yarn/yarn', owner = 'yarn', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/log/hadoop-yarn/yarn', owner = 'yarn', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/run/hadoop-mapreduce', owner = 'mapred', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/run/hadoop-mapreduce/mapred', owner = 'mapred', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/log/hadoop-mapreduce', owner = 'mapred', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/log/hadoop-mapreduce/mapred', owner = 'mapred', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/log/hadoop-yarn', owner = 'yarn', - recursive = True, + create_parents = True, ignore_failures = True, cd_access = 'a', ) @@ -502,7 +502,7 @@ class TestYarnClient(RMFTestCase): ) self.assertResourceCalled('Directory', '/cgroups_test/cpu', group = 'hadoop', - recursive = True, + create_parents = True, mode = 0755, cd_access="a" ) http://git-wip-us.apache.org/repos/asf/ambari/blob/92c054b1/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 0d24a73..468f48d 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 @@ -39,7 +39,7 @@ class TestZookeeperClient(RMFTestCase): self.assertResourceCalled('Directory', '/etc/zookeeper/conf', owner = 'zookeeper', group = 'hadoop', - recursive = True, + create_parents = True, ) self.assertResourceCalled('File', '/etc/zookeeper/conf/zookeeper-env.sh', owner = 'zookeeper', @@ -61,19 +61,19 @@ class TestZookeeperClient(RMFTestCase): self.assertResourceCalled('Directory', '/var/run/zookeeper', owner = 'zookeeper', group = 'hadoop', - recursive = True, + create_parents = True, mode = 0755, ) self.assertResourceCalled('Directory', '/var/log/zookeeper', owner = 'zookeeper', group = 'hadoop', - recursive = True, + create_parents = True, mode = 0755, ) self.assertResourceCalled('Directory', '/hadoop/zookeeper', owner = 'zookeeper', group = 'hadoop', - recursive = True, + create_parents = True, cd_access='a', mode = 0755, ) @@ -102,7 +102,7 @@ class TestZookeeperClient(RMFTestCase): self.assertResourceCalled('Directory', '/etc/zookeeper/conf', owner = 'zookeeper', group = 'hadoop', - recursive = True, + create_parents = True, ) self.assertResourceCalled('File', '/etc/zookeeper/conf/zookeeper-env.sh', owner = 'zookeeper', @@ -124,19 +124,19 @@ class TestZookeeperClient(RMFTestCase): self.assertResourceCalled('Directory', '/var/run/zookeeper', owner = 'zookeeper', group = 'hadoop', - recursive = True, + create_parents = True, mode = 0755, ) self.assertResourceCalled('Directory', '/var/log/zookeeper', owner = 'zookeeper', group = 'hadoop', - recursive = True, + create_parents = True, mode = 0755, ) self.assertResourceCalled('Directory', '/hadoop/zookeeper', owner = 'zookeeper', group = 'hadoop', - recursive = True, + create_parents = True, cd_access='a', mode = 0755 ) http://git-wip-us.apache.org/repos/asf/ambari/blob/92c054b1/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 336a3bc..260cf33 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 @@ -119,7 +119,7 @@ class TestZookeeperServer(RMFTestCase): self.assertResourceCalled('Directory', '/etc/zookeeper/conf', owner = 'zookeeper', group = 'hadoop', - recursive = True, + create_parents = True, ) self.assertResourceCalled('File', '/etc/zookeeper/conf/zookeeper-env.sh', owner = 'zookeeper', @@ -141,19 +141,19 @@ class TestZookeeperServer(RMFTestCase): self.assertResourceCalled('Directory', '/var/run/zookeeper', owner = 'zookeeper', group = 'hadoop', - recursive = True, + create_parents = True, mode = 0755, ) self.assertResourceCalled('Directory', '/var/log/zookeeper', owner = 'zookeeper', group = 'hadoop', - recursive = True, + create_parents = True, mode = 0755, ) self.assertResourceCalled('Directory', '/hadoop/zookeeper', owner = 'zookeeper', group = 'hadoop', - recursive = True, + create_parents = True, cd_access='a', mode = 0755, ) @@ -177,7 +177,7 @@ class TestZookeeperServer(RMFTestCase): self.assertResourceCalled('Directory', '/etc/zookeeper/conf', owner = 'zookeeper', group = 'hadoop', - recursive = True, + create_parents = True, ) self.assertResourceCalled('File', '/etc/zookeeper/conf/zookeeper-env.sh', owner = 'zookeeper', @@ -199,19 +199,19 @@ class TestZookeeperServer(RMFTestCase): self.assertResourceCalled('Directory', '/var/run/zookeeper', owner = 'zookeeper', group = 'hadoop', - recursive = True, + create_parents = True, mode = 0755, ) self.assertResourceCalled('Directory', '/var/log/zookeeper', owner = 'zookeeper', group = 'hadoop', - recursive = True, + create_parents = True, mode = 0755, ) self.assertResourceCalled('Directory', '/hadoop/zookeeper', owner = 'zookeeper', group = 'hadoop', - recursive = True, + create_parents = True, cd_access='a', mode = 0755, ) http://git-wip-us.apache.org/repos/asf/ambari/blob/92c054b1/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py index a7172dd..4020ede 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py +++ b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py @@ -123,7 +123,7 @@ class TestHookBeforeInstall(RMFTestCase): self.assertResourceCalled('Directory', self.TMP_PATH, owner = 'hbase', mode = 0775, - recursive = True, + create_parents = True, cd_access='a' ) self.assertResourceCalled('File', '/tmp/changeUid.sh', @@ -155,7 +155,7 @@ class TestHookBeforeInstall(RMFTestCase): self.assertResourceCalled('Directory', '/etc/hadoop/conf.empty', owner = 'root', group = 'hadoop', - recursive = True, + create_parents = True, ) self.assertResourceCalled('Link', '/etc/hadoop/conf', not_if = 'ls /etc/hadoop/conf', @@ -173,7 +173,7 @@ class TestHookBeforeInstall(RMFTestCase): ) self.assertResourceCalled('Directory', '/tmp/AMBARI-artifacts/', - recursive = True, + create_parents = True, ) self.assertResourceCalled('File', '/tmp/jdk-7u67-linux-x64.tar.gz', content = DownloadSource('http://c6401.ambari.apache.org:8080/resources//jdk-7u67-linux-x64.tar.gz'), @@ -189,11 +189,10 @@ class TestHookBeforeInstall(RMFTestCase): mode = 0755, cd_access = "a", ) - self.assertResourceCalled('Execute', ('chgrp', '-R', u'hadoop', u'/usr/jdk64/jdk1.7.0_45'), - sudo = True, - ) - self.assertResourceCalled('Execute', ('chown', '-R', 'some_user', u'/usr/jdk64/jdk1.7.0_45'), - sudo = True, - ) + self.assertResourceCalled('Directory', '/usr/jdk64/jdk1.7.0_45', + owner = 'some_user', + group = 'hadoop', + recursive_ownership = True, + ) self.assertNoMoreResources() http://git-wip-us.apache.org/repos/asf/ambari/blob/92c054b1/ambari-server/src/test/python/stacks/2.0.6/hooks/before-START/test_before_start.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-START/test_before_start.py b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-START/test_before_start.py index 504fd04..da2b87f 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-START/test_before_start.py +++ b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-START/test_before_start.py @@ -42,18 +42,18 @@ class TestHookBeforeStart(RMFTestCase): owner = 'root', group = 'hadoop', mode = 0775, - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/run/hadoop', owner = 'root', group = 'root', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/tmp/hadoop-hdfs', owner = 'hdfs', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('File', '/etc/hadoop/conf/commons-logging.properties', @@ -115,18 +115,18 @@ class TestHookBeforeStart(RMFTestCase): owner = 'root', group = 'hadoop', mode = 0775, - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/run/hadoop', owner = 'root', group = 'root', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/tmp/hadoop-hdfs', owner = 'hdfs', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('File', '/etc/hadoop/conf/commons-logging.properties', @@ -193,18 +193,18 @@ class TestHookBeforeStart(RMFTestCase): owner = 'root', group = 'hadoop', mode = 0775, - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/run/hadoop', owner = 'root', group = 'root', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/tmp/hadoop-hdfs', owner = 'hdfs', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('File', '/etc/hadoop/conf/commons-logging.properties', @@ -273,18 +273,18 @@ class TestHookBeforeStart(RMFTestCase): owner = 'root', group = 'hadoop', mode = 0775, - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/run/hadoop', owner = 'root', group = 'root', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/tmp/hadoop-hdfs', owner = 'hdfs', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('File', '/etc/hadoop/conf/commons-logging.properties', http://git-wip-us.apache.org/repos/asf/ambari/blob/92c054b1/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 da52643..4d900eb 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 @@ -37,31 +37,31 @@ class TestFalconClient(RMFTestCase): ) self.assertResourceCalled('Directory', '/var/run/falcon', owner = 'falcon', - recursive = True, + create_parents = True, mode = 0755, cd_access = "a", ) self.assertResourceCalled('Directory', '/var/log/falcon', owner = 'falcon', - recursive = True, + create_parents = True, mode = 0755, cd_access = "a", ) self.assertResourceCalled('Directory', '/var/lib/falcon/webapp', owner = 'falcon', - recursive = True + create_parents = True ) self.assertResourceCalled('Directory', '/usr/lib/falcon', owner = 'falcon', - recursive = True + create_parents = True ) self.assertResourceCalled('Directory', '/etc/falcon', mode = 0755, - recursive = True + create_parents = True ) self.assertResourceCalled('Directory', '/etc/falcon/conf', owner = 'falcon', - recursive = True + create_parents = True ) self.assertResourceCalled('File', '/etc/falcon/conf/falcon-env.sh', content = InlineTemplate(self.getConfig()['configurations']['falcon-env']['content']), http://git-wip-us.apache.org/repos/asf/ambari/blob/92c054b1/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 efdb9fe..b14a527 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 @@ -81,31 +81,31 @@ class TestFalconServer(RMFTestCase): def assert_configure_default(self): self.assertResourceCalled('Directory', '/var/run/falcon', owner = 'falcon', - recursive = True, + create_parents = True, cd_access = "a", mode = 0755, ) self.assertResourceCalled('Directory', '/var/log/falcon', owner = 'falcon', - recursive = True, + create_parents = True, cd_access = "a", mode = 0755, ) self.assertResourceCalled('Directory', '/var/lib/falcon/webapp', owner = 'falcon', - recursive = True + create_parents = True ) self.assertResourceCalled('Directory', '/usr/lib/falcon', owner = 'falcon', - recursive = True + create_parents = True ) self.assertResourceCalled('Directory', '/etc/falcon', mode = 0755, - recursive = True + create_parents = True ) self.assertResourceCalled('Directory', '/etc/falcon/conf', owner = 'falcon', - recursive = True + create_parents = True ) self.assertResourceCalled('File', '/etc/falcon/conf/falcon-env.sh', content = InlineTemplate(self.getConfig()['configurations']['falcon-env']['content']), @@ -129,7 +129,7 @@ class TestFalconServer(RMFTestCase): ) self.assertResourceCalled('Directory', '/hadoop/falcon/store', owner = 'falcon', - recursive = True + create_parents = True ) self.assertResourceCalled('HdfsResource', '/apps/falcon', security_enabled = False, @@ -146,7 +146,7 @@ class TestFalconServer(RMFTestCase): ) self.assertResourceCalled('Directory', '/hadoop/falcon/store', owner = 'falcon', - recursive = True, + create_parents = True, ) self.assertResourceCalled('HdfsResource', '/apps/data-mirroring', security_enabled = False, @@ -178,16 +178,16 @@ class TestFalconServer(RMFTestCase): ) self.assertResourceCalled('Directory', '/hadoop/falcon', owner = 'falcon', - recursive = True, + create_parents = True, cd_access='a' ) self.assertResourceCalled('Directory', '/hadoop/falcon/embeddedmq', owner = 'falcon', - recursive = True + create_parents = True ) self.assertResourceCalled('Directory', '/hadoop/falcon/embeddedmq/data', owner = 'falcon', - recursive = True + create_parents = True ) @patch("os.path.isdir") @@ -246,31 +246,31 @@ class TestFalconServer(RMFTestCase): ) self.assertResourceCalled('Directory', '/var/run/falcon', owner = 'falcon', - recursive = True, + create_parents = True, cd_access = "a", mode = 0755, ) self.assertResourceCalled('Directory', '/var/log/falcon', owner = 'falcon', - recursive = True, + create_parents = True, cd_access = "a", mode = 0755, ) self.assertResourceCalled('Directory', '/usr/hdp/current/falcon-server/webapp', owner = 'falcon', - recursive = True, + create_parents = True, ) self.assertResourceCalled('Directory', '/usr/hdp/current/falcon-server', owner = 'falcon', - recursive = True, + create_parents = True, ) self.assertResourceCalled('Directory', '/etc/falcon', - recursive = True, + create_parents = True, mode = 0755, ) self.assertResourceCalled('Directory', '/usr/hdp/current/falcon-server/conf', owner = 'falcon', - recursive = True, + create_parents = True, ) self.assertResourceCalled('File', '/usr/hdp/current/falcon-server/conf/falcon-env.sh', owner = 'falcon', @@ -298,21 +298,21 @@ class TestFalconServer(RMFTestCase): ) self.assertResourceCalled('Directory', '/hadoop/falcon/data/lineage/graphdb', owner = 'falcon', - recursive = True, + create_parents = True, group = 'hadoop', mode = 0775, cd_access = 'a', ) self.assertResourceCalled('Directory', '/hadoop/falcon/data/lineage', owner = 'falcon', - recursive = True, + create_parents = True, group = 'hadoop', mode = 0775, cd_access = 'a', ) self.assertResourceCalled('Directory', '/hadoop/falcon/store', owner = 'falcon', - recursive = True, + create_parents = True, ) self.assertResourceCalled('HdfsResource', '/apps/falcon', security_enabled = False, @@ -332,7 +332,7 @@ class TestFalconServer(RMFTestCase): ) self.assertResourceCalled('Directory', '/hadoop/falcon/store', owner = 'falcon', - recursive = True, + create_parents = True, ) self.assertResourceCalled('HdfsResource', '/apps/data-mirroring', security_enabled = False, @@ -369,16 +369,16 @@ class TestFalconServer(RMFTestCase): ) self.assertResourceCalled('Directory', '/hadoop/falcon', owner = 'falcon', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/hadoop/falcon/embeddedmq', owner = 'falcon', - recursive = True, + create_parents = True, ) self.assertResourceCalled('Directory', '/hadoop/falcon/embeddedmq/data', owner = 'falcon', - recursive = True, + create_parents = True, ) self.assertResourceCalled('Execute', '/usr/hdp/current/falcon-server/bin/falcon-start -port 15000', environment = {'HADOOP_HOME': '/usr/hdp/current/hadoop-client'}, http://git-wip-us.apache.org/repos/asf/ambari/blob/92c054b1/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 6637040..6ef0081 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 @@ -190,7 +190,7 @@ class TestHiveMetastore(RMFTestCase): self.assertResourceCalled('Directory', '/etc/hive/conf', owner = 'hive', group = 'hadoop', - recursive = True, + create_parents = True, ) self.assertResourceCalled('XmlConfig', 'mapred-site.xml', group = 'hadoop', @@ -227,7 +227,7 @@ class TestHiveMetastore(RMFTestCase): self.assertResourceCalled('Directory', '/etc/security/limits.d', owner = 'root', group = 'root', - recursive = True, + create_parents = True, ) self.assertResourceCalled('File', '/etc/security/limits.d/hive.conf', content = Template('hive.conf.j2'), @@ -261,21 +261,21 @@ class TestHiveMetastore(RMFTestCase): owner = 'hive', group = 'hadoop', mode = 0755, - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/log/hive', owner = 'hive', group = 'hadoop', mode = 0755, - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/lib/hive', owner = 'hive', group = 'hadoop', mode = 0755, - recursive = True, + create_parents = True, cd_access = 'a', ) @@ -286,7 +286,7 @@ class TestHiveMetastore(RMFTestCase): self.assertResourceCalled('Directory', '/etc/hive/conf', owner = 'hive', group = 'hadoop', - recursive = True, + create_parents = True, ) self.assertResourceCalled('XmlConfig', 'mapred-site.xml', group = 'hadoop', @@ -323,7 +323,7 @@ class TestHiveMetastore(RMFTestCase): self.assertResourceCalled('Directory', '/etc/security/limits.d', owner = 'root', group = 'root', - recursive = True, + create_parents = True, ) self.assertResourceCalled('File', '/etc/security/limits.d/hive.conf', content = Template('hive.conf.j2'), @@ -357,21 +357,21 @@ class TestHiveMetastore(RMFTestCase): owner = 'hive', group = 'hadoop', mode = 0755, - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/log/hive', owner = 'hive', group = 'hadoop', mode = 0755, - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/lib/hive', owner = 'hive', group = 'hadoop', mode = 0755, - recursive = True, + create_parents = True, cd_access = 'a', ) @@ -641,7 +641,7 @@ class TestHiveMetastore(RMFTestCase): # we don't care about configure here - the strings are different anyway because this # is an upgrade, so just pop those resources off of the call stack self.assertResourceCalledIgnoreEarlier('Directory', '/var/lib/hive', owner = 'hive', group = 'hadoop', - mode = 0755, recursive = True, cd_access = 'a') + mode = 0755, create_parents = True, cd_access = 'a') self.assertResourceCalled('Execute', ('rm', '-f', '/usr/hdp/current/hive-server2/lib/ojdbc6.jar'), path = ['/bin', '/usr/bin/'], @@ -722,7 +722,7 @@ class TestHiveMetastore(RMFTestCase): # we don't care about configure here - the strings are different anyway because this # is an upgrade, so just pop those resources off of the call stack self.assertResourceCalledIgnoreEarlier('Directory', '/var/lib/hive', owner = 'hive', group = 'hadoop', - mode = 0755, recursive = True, cd_access = 'a') + mode = 0755, create_parents = True, cd_access = 'a') self.assertResourceCalled('Execute', ('cp', '--remove-destination', @@ -797,7 +797,7 @@ class TestHiveMetastore(RMFTestCase): # we don't care about configure here - the strings are different anyway because this # is an upgrade, so just pop those resources off of the call stack self.assertResourceCalledIgnoreEarlier('Directory', '/var/lib/hive', owner = 'hive', group = 'hadoop', - mode = 0755, recursive = True, cd_access = 'a') + mode = 0755, create_parents = True, cd_access = 'a') self.assertResourceCalled('Execute', ('rm', '-f', '/usr/hdp/current/hive-server2/lib/ojdbc6.jar'), @@ -818,7 +818,7 @@ class TestHiveMetastore(RMFTestCase): self.assertResourceCalled('Directory', '/usr/hdp/current/hive-server2/lib/native/lib64', - recursive = True) + create_parents = True) self.assertResourceCalled('Execute', ('yes | ambari-sudo.sh cp /tmp/sqla-client-jdbc/native/lib64/* /usr/hdp/current/hive-server2/lib/native/lib64')) @@ -835,7 +835,7 @@ class TestHiveMetastore(RMFTestCase): self.assertResourceCalled('Directory', '/usr/hdp/2.3.0.0-1234/hive/lib/native/lib64', - recursive = True) + create_parents = True) self.assertResourceCalled('Execute', ('yes | ambari-sudo.sh cp /usr/hdp/current/hive-server2/lib/native/lib64/* /usr/hdp/2.3.0.0-1234/hive/lib/native/lib64')) http://git-wip-us.apache.org/repos/asf/ambari/blob/92c054b1/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_base.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_base.py b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_base.py index 301bb58..023b811 100644 --- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_base.py +++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_base.py @@ -34,25 +34,25 @@ class TestStormBase(RMFTestCase): owner = 'storm', group = 'hadoop', mode = 0777, - recursive = True, + create_parents = True, ) self.assertResourceCalled('Directory', '/var/run/storm', owner = 'storm', group = 'hadoop', - recursive = True, + create_parents = True, cd_access='a', mode=0755, ) self.assertResourceCalled('Directory', '/hadoop/storm', owner = 'storm', group = 'hadoop', - recursive = True, + create_parents = True, cd_access='a', mode=0755, ) self.assertResourceCalled('Directory', confDir, group = 'hadoop', - recursive = True, + create_parents = True, cd_access='a' ) self.assertResourceCalled('File', confDir + '/config.yaml', @@ -77,25 +77,25 @@ class TestStormBase(RMFTestCase): owner = 'storm', group = 'hadoop', mode = 0777, - recursive = True, + create_parents = True, ) self.assertResourceCalled('Directory', '/var/run/storm', owner = 'storm', group = 'hadoop', - recursive = True, + create_parents = True, cd_access='a', mode=0755, ) self.assertResourceCalled('Directory', '/hadoop/storm', owner = 'storm', group = 'hadoop', - recursive = True, + create_parents = True, cd_access='a', mode=0755, ) self.assertResourceCalled('Directory', confDir, group = 'hadoop', - recursive = True, + create_parents = True, cd_access='a' ) self.assertResourceCalled('File', confDir + '/config.yaml', http://git-wip-us.apache.org/repos/asf/ambari/blob/92c054b1/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 a23435b..6243913 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 @@ -43,7 +43,7 @@ class TestTezClient(RMFTestCase): self.assertResourceCalled('Directory', '/etc/tez/conf', owner = 'tez', group = 'hadoop', - recursive = True + create_parents = True ) self.assertResourceCalled('XmlConfig', 'tez-site.xml', http://git-wip-us.apache.org/repos/asf/ambari/blob/92c054b1/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 f488509..4fccd91 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 @@ -96,48 +96,48 @@ class TestAppTimelineServer(RMFTestCase): self.assertResourceCalled('Directory', '/var/run/hadoop-yarn', owner = 'yarn', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/run/hadoop-yarn/yarn', owner = 'yarn', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/log/hadoop-yarn/yarn', owner = 'yarn', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/run/hadoop-mapreduce', owner = 'mapred', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/run/hadoop-mapreduce/mapred', owner = 'mapred', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/log/hadoop-mapreduce', owner = 'mapred', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/log/hadoop-mapreduce/mapred', owner = 'mapred', group = 'hadoop', - recursive = True, + create_parents = True, cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/log/hadoop-yarn', owner = 'yarn', - recursive = True, + create_parents = True, ignore_failures = True, cd_access = 'a', ) @@ -184,7 +184,7 @@ class TestAppTimelineServer(RMFTestCase): self.assertResourceCalled('Directory', '/var/log/hadoop-yarn/timeline', owner = 'yarn', group = 'hadoop', - recursive = True, + create_parents = True, cd_access='a' ) self.assertResourceCalled('HdfsResource', None, @@ -229,7 +229,7 @@ class TestAppTimelineServer(RMFTestCase): ) self.assertResourceCalled('Directory', '/cgroups_test/cpu', group = 'hadoop', - recursive = True, + create_parents = True, mode = 0755, cd_access="a" ) http://git-wip-us.apache.org/repos/asf/ambari/blob/92c054b1/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 e368f2a..f1e0466 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 @@ -36,51 +36,41 @@ class TestKafkaBroker(RMFTestCase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) - self.assertResourceCalled('Directory', '/var/log/kafka', owner = 'kafka', group = 'hadoop', - recursive = True, + create_parents = True, mode = 0755, - cd_access = 'a' + cd_access = 'a', + recursive_ownership = True, ) self.assertResourceCalled('Directory', '/var/run/kafka', owner = 'kafka', group = 'hadoop', - recursive = True, + create_parents = True, mode = 0755, - cd_access = 'a' + cd_access = 'a', + recursive_ownership = True, ) self.assertResourceCalled('Directory', '/usr/hdp/current/kafka-broker/config', owner = 'kafka', group = 'hadoop', - recursive = True, + create_parents = True, mode = 0755, - cd_access = 'a' + cd_access = 'a', + recursive_ownership = True, ) - - self.assertResourceCalled('Execute', ('chown', '-R', u'kafka:hadoop', u'/var/log/kafka'), - sudo = True) - - self.assertResourceCalled('Execute', ('chown', '-R', u'kafka:hadoop', u'/var/run/kafka'), - sudo = True) - - self.assertResourceCalled('Execute', ('chown', '-R', u'kafka:hadoop', '/usr/hdp/current/kafka-broker/config'), - sudo = True) - self.assertResourceCalled('Directory', '/tmp/log/dir', owner = 'kafka', - recursive = True, + create_parents = True, group = 'hadoop', mode = 0755, cd_access = 'a', + recursive_ownership = True, ) - self.assertResourceCalled('Execute', ('chown', '-R', u'kafka:hadoop', u'/tmp/log/dir'), - sudo = True) - @patch("os.path.islink") @patch("os.path.realpath") @@ -97,47 +87,39 @@ class TestKafkaBroker(RMFTestCase): self.assertResourceCalled('Directory', '/customdisk/var/log/kafka', owner = 'kafka', group = 'hadoop', - recursive = True, + create_parents = True, mode = 0755, - cd_access = 'a' + cd_access = 'a', + recursive_ownership = True, ) self.assertResourceCalled('Directory', '/customdisk/var/run/kafka', owner = 'kafka', group = 'hadoop', - recursive = True, + create_parents = True, mode = 0755, - cd_access = 'a' + cd_access = 'a', + recursive_ownership = True, ) self.assertResourceCalled('Directory', '/usr/hdp/current/kafka-broker/config', owner = 'kafka', group = 'hadoop', - recursive = True, + create_parents = True, mode = 0755, - cd_access = 'a' + cd_access = 'a', + recursive_ownership = True, ) - self.assertResourceCalled('Execute', ('chown', '-R', u'kafka:hadoop', u'/customdisk/var/log/kafka'), - sudo = True) - - self.assertResourceCalled('Execute', ('chown', '-R', u'kafka:hadoop', u'/customdisk/var/run/kafka'), - sudo = True) - - self.assertResourceCalled('Execute', ('chown', '-R', u'kafka:hadoop', '/usr/hdp/current/kafka-broker/config'), - sudo = True) - self.assertResourceCalled('Directory', '/tmp/log/dir', owner = 'kafka', - recursive = True, + create_parents = True, group = 'hadoop', mode = 0755, cd_access = 'a', + recursive_ownership = True, ) - self.assertResourceCalled('Execute', ('chown', '-R', u'kafka:hadoop', u'/tmp/log/dir'), - sudo = True) - self.assertTrue(islink_mock.called) self.assertTrue(realpath_mock.called) http://git-wip-us.apache.org/repos/asf/ambari/blob/92c054b1/ambari-server/src/test/python/stacks/2.2/KERBEROS/test_kerberos_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/KERBEROS/test_kerberos_client.py b/ambari-server/src/test/python/stacks/2.2/KERBEROS/test_kerberos_client.py index 7673988..0592fc4 100644 --- a/ambari-server/src/test/python/stacks/2.2/KERBEROS/test_kerberos_client.py +++ b/ambari-server/src/test/python/stacks/2.2/KERBEROS/test_kerberos_client.py @@ -46,7 +46,7 @@ class TestKerberosClient(RMFTestCase): owner='root', group='root', mode=0755, - recursive=True) + create_parents = True) file_path = (use_cases.get_krb5_conf_dir(json_data) + "/" + @@ -72,7 +72,7 @@ class TestKerberosClient(RMFTestCase): owner='root', group='root', mode=0755, - recursive=True) + create_parents = True) file_path = (use_cases.get_krb5_conf_dir(json_data) + "/" + @@ -96,7 +96,7 @@ class TestKerberosClient(RMFTestCase): ) self.assertResourceCalled('Directory', '/tmp/AMBARI-artifacts/', - recursive = True, + create_parents = True, ) self.assertResourceCalled('File', '/tmp/AMBARI-artifacts//UnlimitedJCEPolicyJDK7.zip', content = DownloadSource('http://c6401.ambari.apache.org:8080/resources//UnlimitedJCEPolicyJDK7.zip'), @@ -118,7 +118,7 @@ class TestKerberosClient(RMFTestCase): owner='root', group='root', mode=0755, - recursive=True) + create_parents = True) file_path = (use_cases.get_krb5_conf_dir(json_data) + "/" + @@ -144,7 +144,7 @@ class TestKerberosClient(RMFTestCase): owner='root', group='root', mode=0755, - recursive=True) + create_parents = True) file_path = (use_cases.get_krb5_conf_dir(json_data) + "/" + @@ -278,7 +278,7 @@ class TestKerberosClient(RMFTestCase): owner='root', group='root', mode=0755, - recursive=True) + create_parents = True) self.assertResourceCalled('File', "/etc/security/keytabs/spnego.service.keytab", owner='root', @@ -303,7 +303,7 @@ class TestKerberosClient(RMFTestCase): owner='root', group='root', mode=0755, - recursive=True) + create_parents = True) self.assertResourceCalled('File', "/etc/security/keytabs/smokeuser.headless.keytab", owner='ambari-qa', http://git-wip-us.apache.org/repos/asf/ambari/blob/92c054b1/ambari-server/src/test/python/stacks/2.2/KERBEROS/test_kerberos_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/KERBEROS/test_kerberos_server.py b/ambari-server/src/test/python/stacks/2.2/KERBEROS/test_kerberos_server.py index cc69630..4de232e 100644 --- a/ambari-server/src/test/python/stacks/2.2/KERBEROS/test_kerberos_server.py +++ b/ambari-server/src/test/python/stacks/2.2/KERBEROS/test_kerberos_server.py @@ -45,7 +45,7 @@ class TestKerberosServer(RMFTestCase): owner='root', group='root', mode=0755, - recursive=True) + create_parents = True) file_path = (use_cases.get_krb5_conf_dir(json_data) + "/" + @@ -61,7 +61,7 @@ class TestKerberosServer(RMFTestCase): owner='root', group='root', mode=0700, - recursive=True) + create_parents = True) file_path = (use_cases.get_kdc_conf_dir(json_data) + "/" + @@ -77,7 +77,7 @@ class TestKerberosServer(RMFTestCase): owner='root', group='root', mode=0700, - recursive=True) + create_parents = True) file_path = (use_cases.get_kadm5_acl_dir(json_data) + "/" + @@ -104,7 +104,7 @@ class TestKerberosServer(RMFTestCase): owner='root', group='root', mode=0755, - recursive=True) + create_parents = True) file_path = (use_cases.get_krb5_conf_dir(json_data) + "/" + @@ -120,7 +120,7 @@ class TestKerberosServer(RMFTestCase): owner='root', group='root', mode=0700, - recursive=True) + create_parents = True) file_path = (use_cases.get_kdc_conf_dir(json_data) + "/" + @@ -136,7 +136,7 @@ class TestKerberosServer(RMFTestCase): owner='root', group='root', mode=0700, - recursive=True) + create_parents = True) file_path = (use_cases.get_kadm5_acl_dir(json_data) + "/" + @@ -163,7 +163,7 @@ class TestKerberosServer(RMFTestCase): owner='root', group='root', mode=0755, - recursive=True) + create_parents = True) file_path = (use_cases.get_krb5_conf_dir(json_data) + "/" + @@ -179,7 +179,7 @@ class TestKerberosServer(RMFTestCase): owner='root', group='root', mode=0700, - recursive=True) + create_parents = True) file_path = (use_cases.get_kdc_conf_dir(json_data) + "/" + @@ -195,7 +195,7 @@ class TestKerberosServer(RMFTestCase): owner='root', group='root', mode=0700, - recursive=True) + create_parents = True) file_path = (use_cases.get_kadm5_acl_dir(json_data) + "/" + @@ -222,7 +222,7 @@ class TestKerberosServer(RMFTestCase): owner='root', group='root', mode=0755, - recursive=True) + create_parents = True) file_path = (use_cases.get_krb5_conf_dir(json_data) + "/" + @@ -238,7 +238,7 @@ class TestKerberosServer(RMFTestCase): owner='root', group='root', mode=0700, - recursive=True) + create_parents = True) file_path = (use_cases.get_kdc_conf_dir(json_data) + "/" + @@ -254,7 +254,7 @@ class TestKerberosServer(RMFTestCase): owner='root', group='root', mode=0700, - recursive=True) + create_parents = True) file_path = (use_cases.get_kadm5_acl_dir(json_data) + "/" + http://git-wip-us.apache.org/repos/asf/ambari/blob/92c054b1/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 5f4e6fc..7c3b921 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 @@ -42,37 +42,42 @@ class TestKnoxGateway(RMFTestCase): self.assertResourceCalled('Directory', '/usr/hdp/current/knox-server/data/', owner = 'knox', group = 'knox', - recursive = True, + create_parents = True, mode = 0755, cd_access = "a", + recursive_ownership = True, ) self.assertResourceCalled('Directory', '/var/log/knox', owner = 'knox', group = 'knox', - recursive = True, + create_parents = True, mode = 0755, cd_access = "a", + recursive_ownership = True, ) self.assertResourceCalled('Directory', '/var/run/knox', owner = 'knox', group = 'knox', - recursive = True, + create_parents = True, mode = 0755, cd_access = "a", + recursive_ownership = True, ) self.assertResourceCalled('Directory', '/usr/hdp/current/knox-server/conf', owner = 'knox', group = 'knox', - recursive = True, + create_parents = True, mode = 0755, cd_access = "a", + recursive_ownership = True, ) self.assertResourceCalled('Directory', '/usr/hdp/current/knox-server/conf/topologies', owner = 'knox', group = 'knox', - recursive = True, + create_parents = True, mode = 0755, cd_access = "a", + recursive_ownership = True, ) self.assertResourceCalled('XmlConfig', 'gateway-site.xml', @@ -99,16 +104,6 @@ class TestKnoxGateway(RMFTestCase): owner = 'knox', content = InlineTemplate(self.getConfig()['configurations']['admin-topology']['content']) ) - self.assertResourceCalled('Execute', ('chown', - '-R', - 'knox:knox', - '/usr/hdp/current/knox-server/data/', - '/var/log/knox', - '/var/run/knox', - '/usr/hdp/current/knox-server/conf', - '/usr/hdp/current/knox-server/conf/topologies'), - sudo = True, - ) self.assertResourceCalled('Execute', '/usr/hdp/current/knox-server/bin/knoxcli.sh create-master --master sa', environment = {'JAVA_HOME': u'/usr/jdk64/jdk1.7.0_45'}, not_if = "ambari-sudo.sh su knox -l -s /bin/bash -c '[RMF_EXPORT_PLACEHOLDER]test -f /usr/hdp/current/knox-server/data/security/master'", @@ -494,37 +489,42 @@ class TestKnoxGateway(RMFTestCase): self.assertResourceCalled('Directory', '/usr/hdp/current/knox-server/data/', owner = 'knox', group = 'knox', - recursive = True, + create_parents = True, mode = 0755, cd_access = "a", + recursive_ownership = True, ) self.assertResourceCalled('Directory', '/var/log/knox', owner = 'knox', group = 'knox', - recursive = True, + create_parents = True, mode = 0755, cd_access = "a", + recursive_ownership = True, ) self.assertResourceCalled('Directory', '/var/run/knox', owner = 'knox', group = 'knox', - recursive = True, + create_parents = True, mode = 0755, cd_access = "a", + recursive_ownership = True, ) self.assertResourceCalled('Directory', '/usr/hdp/current/knox-server/conf', owner = 'knox', group = 'knox', - recursive = True, + create_parents = True, mode = 0755, cd_access = "a", + recursive_ownership = True, ) self.assertResourceCalled('Directory', '/usr/hdp/current/knox-server/conf/topologies', owner = 'knox', group = 'knox', - recursive = True, + create_parents = True, mode = 0755, cd_access = "a", + recursive_ownership = True, ) self.assertResourceCalled('XmlConfig', 'gateway-site.xml', @@ -551,15 +551,6 @@ class TestKnoxGateway(RMFTestCase): owner = 'knox', content = InlineTemplate(self.getConfig()['configurations']['admin-topology']['content']) ) - self.assertResourceCalled('Execute', ('chown', - '-R', - 'knox:knox', - '/usr/hdp/current/knox-server/data/', - '/var/log/knox', - '/var/run/knox', - '/usr/hdp/current/knox-server/conf', '/usr/hdp/current/knox-server/conf/topologies'), - sudo = True, - ) self.assertResourceCalled('Execute', '/usr/hdp/current/knox-server/bin/knoxcli.sh create-master --master sa', environment = {'JAVA_HOME': u'/usr/jdk64/jdk1.7.0_45'}, not_if = "ambari-sudo.sh su knox -l -s /bin/bash -c '[RMF_EXPORT_PLACEHOLDER]test -f /usr/hdp/current/knox-server/data/security/master'", @@ -589,11 +580,9 @@ class TestKnoxGateway(RMFTestCase): owner = 'knox', mode = 0755, group = 'knox', - recursive = True, + create_parents = True, cd_access = 'a', - ) - self.assertResourceCalled('Execute', ('chown', '-R', u'knox:knox', u'/var/log/knox'), - sudo = True, + recursive_ownership = True, ) self.assertResourceCalled("Execute", "/usr/hdp/current/knox-server/bin/gateway.sh start", environment = {'JAVA_HOME': u'/usr/jdk64/jdk1.7.0_45'}, http://git-wip-us.apache.org/repos/asf/ambari/blob/92c054b1/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 de00077..01787a1 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 @@ -37,7 +37,7 @@ class TestSliderClient(RMFTestCase): self.assertResourceCalled('Directory', '/usr/hdp/current/slider-client/conf', - recursive=True + create_parents = True ) self.assertResourceCalled('XmlConfig', @@ -53,7 +53,7 @@ class TestSliderClient(RMFTestCase): self.assertResourceCalled('Directory', '/usr/hdp/current/storm-slider-client/conf', - recursive=True + create_parents = True ) self.assertResourceCalled('File', '/usr/hdp/current/storm-slider-client/conf/storm-slider-env.sh', http://git-wip-us.apache.org/repos/asf/ambari/blob/92c054b1/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 d4fef77..30da734 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 @@ -158,13 +158,13 @@ class TestJobHistoryServer(RMFTestCase): self.assertResourceCalled('Directory', '/var/run/spark', owner = 'spark', group = 'hadoop', - recursive = True, + create_parents = True, mode = 0775 ) self.assertResourceCalled('Directory', '/var/log/spark', owner = 'spark', group = 'hadoop', - recursive = True, + create_parents = True, mode = 0775 ) self.assertResourceCalled('HdfsResource', '/user/spark', @@ -222,13 +222,13 @@ class TestJobHistoryServer(RMFTestCase): self.assertResourceCalled('Directory', '/var/run/spark', owner = 'spark', group = 'hadoop', - recursive = True, + create_parents = True, mode = 0775 ) self.assertResourceCalled('Directory', '/var/log/spark', owner = 'spark', group = 'hadoop', - recursive = True, + create_parents = True, mode = 0775 ) self.assertResourceCalled('HdfsResource', '/user/spark', http://git-wip-us.apache.org/repos/asf/ambari/blob/92c054b1/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 841a4c0..8aef27c 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 @@ -55,13 +55,13 @@ class TestSparkClient(RMFTestCase): self.assertResourceCalled('Directory', '/var/run/spark', owner = 'spark', group = 'hadoop', - recursive = True, + create_parents = True, mode = 0775 ) self.assertResourceCalled('Directory', '/var/log/spark', owner = 'spark', group = 'hadoop', - recursive = True, + create_parents = True, mode = 0775 ) self.assertResourceCalled('PropertiesFile', '/usr/hdp/current/spark-client/conf/spark-defaults.conf', @@ -91,13 +91,13 @@ class TestSparkClient(RMFTestCase): self.assertResourceCalled('Directory', '/var/run/spark', owner = 'spark', group = 'hadoop', - recursive = True, + create_parents = True, mode = 0775 ) self.assertResourceCalled('Directory', '/var/log/spark', owner = 'spark', group = 'hadoop', - recursive = True, + create_parents = True, mode = 0775 ) self.assertResourceCalled('PropertiesFile', '/usr/hdp/current/spark-client/conf/spark-defaults.conf', http://git-wip-us.apache.org/repos/asf/ambari/blob/92c054b1/ambari-server/src/test/python/stacks/2.3/ATLAS/test_metadata_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/ATLAS/test_metadata_server.py b/ambari-server/src/test/python/stacks/2.3/ATLAS/test_metadata_server.py index 2644b4e..2bd02c7 100644 --- a/ambari-server/src/test/python/stacks/2.3/ATLAS/test_metadata_server.py +++ b/ambari-server/src/test/python/stacks/2.3/ATLAS/test_metadata_server.py @@ -34,35 +34,35 @@ class TestMetadataServer(RMFTestCase): self.assertResourceCalled('Directory', '/var/run/atlas', owner='atlas', group='hadoop', - recursive=True, + create_parents = True, cd_access='a', mode=0755 ) self.assertResourceCalled('Directory', '/etc/atlas/conf', owner='atlas', group='hadoop', - recursive=True, + create_parents = True, cd_access='a', mode=0755 ) self.assertResourceCalled('Directory', '/var/log/atlas', owner='atlas', group='hadoop', - recursive=True, + create_parents = True, cd_access='a', mode=0755 ) self.assertResourceCalled('Directory', '/var/lib/atlas/data', owner='atlas', group='hadoop', - recursive=True, + create_parents = True, cd_access='a', mode=0644 ) self.assertResourceCalled('Directory', '/var/lib/atlas/server/webapp', owner='atlas', group='hadoop', - recursive=True, + create_parents = True, cd_access='a', mode=0644 ) http://git-wip-us.apache.org/repos/asf/ambari/blob/92c054b1/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 db8c0d9..f0f6326 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 @@ -42,7 +42,7 @@ class TestMahoutClient(RMFTestCase): '/usr/hdp/current/mahout-client/conf', owner = 'mahout', group = 'hadoop', - recursive = True) + create_parents = True) self.assertResourceCalled('XmlConfig', 'yarn-site.xml', owner = "yarn", http://git-wip-us.apache.org/repos/asf/ambari/blob/92c054b1/ambari-server/src/test/python/stacks/2.3/PXF/test_pxf.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/PXF/test_pxf.py b/ambari-server/src/test/python/stacks/2.3/PXF/test_pxf.py index 2dd00ac..3d803c5 100644 --- a/ambari-server/src/test/python/stacks/2.3/PXF/test_pxf.py +++ b/ambari-server/src/test/python/stacks/2.3/PXF/test_pxf.py @@ -96,7 +96,7 @@ class TestPxf(RMFTestCase): self.assertResourceCalled('Directory', '/var/pxf', owner=self.PXF_USER, group=self.PXF_GROUP, - recursive=True) + create_parents = True) self.assertResourceCalled('Execute', 'service pxf-service restart', timeout=self.DEFAULT_TIMEOUT, http://git-wip-us.apache.org/repos/asf/ambari/blob/92c054b1/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 22e2eda..0a5ab6b 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 @@ -81,13 +81,13 @@ class TestSparkThriftServer(RMFTestCase): self.assertResourceCalled('Directory', '/var/run/spark', owner = 'spark', group = 'hadoop', - recursive = True, + create_parents = True, mode = 0775 ) self.assertResourceCalled('Directory', '/var/log/spark', owner = 'spark', group = 'hadoop', - recursive = True, + create_parents = True, mode = 0775 ) self.assertResourceCalled('HdfsResource', '/user/spark',
