Просмотр исходного кода

AMBARI-4748. Remove decimal file permissions from python unittests
(Vitaliy Semenyk via aonishuk)

Andrew Onischuk 11 лет назад
Родитель
Сommit
b815bd2e0b
31 измененных файлов с 182 добавлено и 182 удалено
  1. 2 2
      ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_client.py
  2. 10 10
      ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_metastore.py
  3. 10 10
      ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_server.py
  4. 4 4
      ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_service_check.py
  5. 2 2
      ambari-server/src/test/python/stacks/1.3.2/HIVE/test_mysql_server.py
  6. 3 3
      ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_client.py
  7. 3 3
      ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_historyserver.py
  8. 3 3
      ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_jobtracker.py
  9. 3 3
      ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_tasktracker.py
  10. 2 2
      ambari-server/src/test/python/stacks/1.3.2/PIG/test_pig_service_check.py
  11. 4 4
      ambari-server/src/test/python/stacks/1.3.2/WEBHCAT/test_webhcat_server.py
  12. 2 2
      ambari-server/src/test/python/stacks/1.3.2/WEBHCAT/test_webhcat_service_check.py
  13. 2 2
      ambari-server/src/test/python/stacks/1.3.2/ZOOKEEPER/test_zookeeper_server.py
  14. 2 2
      ambari-server/src/test/python/stacks/1.3.2/ZOOKEEPER/test_zookeeper_service_check.py
  15. 1 1
      ambari-server/src/test/python/stacks/1.3.2/hooks/before-START/test_before_start.py
  16. 2 2
      ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_client.py
  17. 10 10
      ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py
  18. 10 10
      ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py
  19. 4 4
      ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py
  20. 2 2
      ambari-server/src/test/python/stacks/2.0.6/HIVE/test_mysql_server.py
  21. 2 2
      ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_service_check.py
  22. 4 4
      ambari-server/src/test/python/stacks/2.0.6/WEBHCAT/test_webhcat_server.py
  23. 2 2
      ambari-server/src/test/python/stacks/2.0.6/WEBHCAT/test_webhcat_service_check.py
  24. 16 16
      ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py
  25. 16 16
      ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_client.py
  26. 16 16
      ambari-server/src/test/python/stacks/2.0.6/YARN/test_nodemanager.py
  27. 16 16
      ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py
  28. 23 23
      ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_client.py
  29. 2 2
      ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_service_check.py
  30. 2 2
      ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py
  31. 2 2
      ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_service_check.py

+ 2 - 2
ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_client.py

@@ -36,7 +36,7 @@ class TestHiveClient(RMFTestCase):
     self.assertResourceCalled('XmlConfig', 'hive-site.xml',
       owner = 'hive',
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
       conf_dir = '/etc/hive/conf',
       configurations = self.getConfig()['configurations']['hive-site'],
     )
@@ -90,7 +90,7 @@ class TestHiveClient(RMFTestCase):
     self.assertResourceCalled('XmlConfig', 'hive-site.xml',
       owner = 'hive',
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
       conf_dir = '/etc/hive/conf',
       configurations = self.getConfig()['configurations']['hive-site'],
     )

+ 10 - 10
ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_metastore.py

@@ -176,7 +176,7 @@ class TestHiveMetastore(RMFTestCase):
     self.assertResourceCalled('XmlConfig', 'hive-site.xml',
       owner = 'hive',
       group = 'hadoop',
-      mode = 384,
+      mode = 0600,
       conf_dir = '/etc/hive/conf.server',
       configurations = self.getConfig()['configurations']['hive-site'],
     )
@@ -185,24 +185,24 @@ class TestHiveMetastore(RMFTestCase):
     )
     self.assertResourceCalled('File', '/tmp/start_metastore_script',
       content = StaticFile('startMetastore.sh'),
-      mode = 493,
+      mode = 0755,
     )
     self.assertResourceCalled('Directory', '/var/run/hive',
       owner = 'hive',
       group = 'hadoop',
-      mode = 493,
+      mode = 0755,
       recursive = True,
     )
     self.assertResourceCalled('Directory', '/var/log/hive',
       owner = 'hive',
       group = 'hadoop',
-      mode = 493,
+      mode = 0755,
       recursive = True,
     )
     self.assertResourceCalled('Directory', '/var/lib/hive',
       owner = 'hive',
       group = 'hadoop',
-      mode = 493,
+      mode = 0755,
       recursive = True,
     )
     self.assertResourceCalled('File', '/etc/hive/conf.server/hive-env.sh',
@@ -233,7 +233,7 @@ class TestHiveMetastore(RMFTestCase):
     self.assertResourceCalled('XmlConfig', 'hive-site.xml',
       owner = 'hive',
       group = 'hadoop',
-      mode = 384,
+      mode = 0600,
       conf_dir = '/etc/hive/conf.server',
       configurations = self.getConfig()['configurations']['hive-site'],
     )
@@ -242,24 +242,24 @@ class TestHiveMetastore(RMFTestCase):
     )
     self.assertResourceCalled('File', '/tmp/start_metastore_script',
       content = StaticFile('startMetastore.sh'),
-      mode = 493,
+      mode = 0755,
     )
     self.assertResourceCalled('Directory', '/var/run/hive',
       owner = 'hive',
       group = 'hadoop',
-      mode = 493,
+      mode = 0755,
       recursive = True,
     )
     self.assertResourceCalled('Directory', '/var/log/hive',
       owner = 'hive',
       group = 'hadoop',
-      mode = 493,
+      mode = 0755,
       recursive = True,
     )
     self.assertResourceCalled('Directory', '/var/lib/hive',
       owner = 'hive',
       group = 'hadoop',
-      mode = 493,
+      mode = 0755,
       recursive = True,
     )
     self.assertResourceCalled('File', '/etc/hive/conf.server/hive-env.sh',

+ 10 - 10
ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_server.py

@@ -205,7 +205,7 @@ class TestHiveServer(RMFTestCase):
     self.assertResourceCalled('XmlConfig', 'hive-site.xml',
       owner = 'hive',
       group = 'hadoop',
-      mode = 384,
+      mode = 0600,
       conf_dir = '/etc/hive/conf.server',
       configurations = self.getConfig()['configurations']['hive-site'],
     )
@@ -214,24 +214,24 @@ class TestHiveServer(RMFTestCase):
     )
     self.assertResourceCalled('File', '/tmp/start_hiveserver2_script',
       content = StaticFile('startHiveserver2.sh'),
-      mode = 493,
+      mode = 0755,
     )
     self.assertResourceCalled('Directory', '/var/run/hive',
       owner = 'hive',
       group = 'hadoop',
-      mode = 493,
+      mode = 0755,
       recursive = True,
     )
     self.assertResourceCalled('Directory', '/var/log/hive',
       owner = 'hive',
       group = 'hadoop',
-      mode = 493,
+      mode = 0755,
       recursive = True,
     )
     self.assertResourceCalled('Directory', '/var/lib/hive',
       owner = 'hive',
       group = 'hadoop',
-      mode = 493,
+      mode = 0755,
       recursive = True,
     )
     self.assertResourceCalled('File', '/etc/hive/conf.server/hive-env.sh',
@@ -290,7 +290,7 @@ class TestHiveServer(RMFTestCase):
     self.assertResourceCalled('XmlConfig', 'hive-site.xml',
       owner = 'hive',
       group = 'hadoop',
-      mode = 384,
+      mode = 0600,
       conf_dir = '/etc/hive/conf.server',
       configurations = self.getConfig()['configurations']['hive-site'],
     )
@@ -299,24 +299,24 @@ class TestHiveServer(RMFTestCase):
     )
     self.assertResourceCalled('File', '/tmp/start_hiveserver2_script',
       content = StaticFile('startHiveserver2.sh'),
-      mode = 493,
+      mode = 0755,
     )
     self.assertResourceCalled('Directory', '/var/run/hive',
       owner = 'hive',
       group = 'hadoop',
-      mode = 493,
+      mode = 0755,
       recursive = True,
     )
     self.assertResourceCalled('Directory', '/var/log/hive',
       owner = 'hive',
       group = 'hadoop',
-      mode = 493,
+      mode = 0755,
       recursive = True,
     )
     self.assertResourceCalled('Directory', '/var/lib/hive',
       owner = 'hive',
       group = 'hadoop',
-      mode = 493,
+      mode = 0755,
       recursive = True,
     )
     self.assertResourceCalled('File', '/etc/hive/conf.server/hive-env.sh',

+ 4 - 4
ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_service_check.py

@@ -33,7 +33,7 @@ class TestServiceCheck(RMFTestCase):
     )
     self.assertResourceCalled('File', '/tmp/hiveserver2Smoke.sh',
                         content = StaticFile('hiveserver2Smoke.sh'),
-                        mode = 493,
+                        mode = 0755,
     )
     self.assertResourceCalled('File', '/tmp/hiveserver2.sql',
                         content = StaticFile('hiveserver2.sql'),
@@ -47,7 +47,7 @@ class TestServiceCheck(RMFTestCase):
     )
     self.assertResourceCalled('File', '/tmp/hcatSmoke.sh',
                         content = StaticFile('hcatSmoke.sh'),
-                        mode = 493,
+                        mode = 0755,
     )
     self.assertResourceCalled('Execute', 'sh /tmp/hcatSmoke.sh hcatsmoke prepare',
                         logoutput = True,
@@ -82,7 +82,7 @@ class TestServiceCheck(RMFTestCase):
     )
     self.assertResourceCalled('File', '/tmp/hiveserver2Smoke.sh',
                         content = StaticFile('hiveserver2Smoke.sh'),
-                        mode = 493,
+                        mode = 0755,
     )
     self.assertResourceCalled('File', '/tmp/hiveserver2.sql',
                         content = StaticFile('hiveserver2.sql'),
@@ -96,7 +96,7 @@ class TestServiceCheck(RMFTestCase):
     )
     self.assertResourceCalled('File', '/tmp/hcatSmoke.sh',
                         content = StaticFile('hcatSmoke.sh'),
-                        mode = 493,
+                        mode = 0755,
     )
     self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab ambari-qa; sh /tmp/hcatSmoke.sh hcatsmoke prepare',
                         logoutput = True,

+ 2 - 2
ambari-server/src/test/python/stacks/1.3.2/HIVE/test_mysql_server.py

@@ -104,7 +104,7 @@ class TestMySqlServer(RMFTestCase):
     )
     self.assertResourceCalled('File', '/tmp/addMysqlUser.sh',
       content = StaticFile('addMysqlUser.sh'),
-      mode = 493,
+      mode = 0755,
     )
     self.assertResourceCalled('Execute', 'bash -x /tmp/addMysqlUser.sh mysql hive \'!`"\'"\'"\' 1\' c6402.ambari.apache.org',
       path = ['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'],
@@ -125,7 +125,7 @@ class TestMySqlServer(RMFTestCase):
     )
     self.assertResourceCalled('File', '/tmp/addMysqlUser.sh',
       content = StaticFile('addMysqlUser.sh'),
-      mode = 493,
+      mode = 0755,
     )
     self.assertResourceCalled('Execute', 'bash -x /tmp/addMysqlUser.sh mysql hive \'!`"\'"\'"\' 1\' c6402.ambari.apache.org',
       path = ['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'],

+ 3 - 3
ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_client.py

@@ -41,12 +41,12 @@ class TestMapreduceClient(RMFTestCase):
     self.assertResourceCalled('Directory', '/hadoop/mapred',
       owner = 'mapred',
       recursive = True,
-      mode = 493,
+      mode = 0755,
     )
     self.assertResourceCalled('Directory', '/hadoop/mapred1',
       owner = 'mapred',
       recursive = True,
-      mode = 493,
+      mode = 0755,
     )
     self.assertResourceCalled('File', '/etc/hadoop/conf/mapred.exclude',
       owner = 'mapred',
@@ -78,7 +78,7 @@ class TestMapreduceClient(RMFTestCase):
     self.assertResourceCalled('Directory', '/hadoop/mapred',
       owner = 'mapred',
       recursive = True,
-      mode = 493,
+      mode = 0755,
     )
     self.assertResourceCalled('File', '/etc/hadoop/conf/mapred.exclude',
       owner = 'mapred',

+ 3 - 3
ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_historyserver.py

@@ -177,12 +177,12 @@ class TestHistoryServer(RMFTestCase):
     self.assertResourceCalled('Directory', '/hadoop/mapred',
       owner = 'mapred',
       recursive = True,
-      mode = 493,
+      mode = 0755,
     )
     self.assertResourceCalled('Directory', '/hadoop/mapred1',
       owner = 'mapred',
       recursive = True,
-      mode = 493,
+      mode = 0755,
     )
     self.assertResourceCalled('File', '/etc/hadoop/conf/mapred.exclude',
       owner = 'mapred',
@@ -264,7 +264,7 @@ class TestHistoryServer(RMFTestCase):
     self.assertResourceCalled('Directory', '/hadoop/mapred',
       owner = 'mapred',
       recursive = True,
-      mode = 493,
+      mode = 0755,
     )
     self.assertResourceCalled('File', '/etc/hadoop/conf/mapred.exclude',
       owner = 'mapred',

+ 3 - 3
ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_jobtracker.py

@@ -231,12 +231,12 @@ class TestJobtracker(RMFTestCase):
     self.assertResourceCalled('Directory', '/hadoop/mapred',
       owner = 'mapred',
       recursive = True,
-      mode = 493,
+      mode = 0755,
     )
     self.assertResourceCalled('Directory', '/hadoop/mapred1',
       owner = 'mapred',
       recursive = True,
-      mode = 493,
+      mode = 0755,
     )
     self.assertResourceCalled('File', '/etc/hadoop/conf/mapred.exclude',
       owner = 'mapred',
@@ -318,7 +318,7 @@ class TestJobtracker(RMFTestCase):
     self.assertResourceCalled('Directory', '/hadoop/mapred',
       owner = 'mapred',
       recursive = True,
-      mode = 493,
+      mode = 0755,
     )
     self.assertResourceCalled('File', '/etc/hadoop/conf/mapred.exclude',
       owner = 'mapred',

+ 3 - 3
ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_tasktracker.py

@@ -120,12 +120,12 @@ class TestTasktracker(RMFTestCase):
     self.assertResourceCalled('Directory', '/hadoop/mapred',
       owner = 'mapred',
       recursive = True,
-      mode = 493,
+      mode = 0755,
     )
     self.assertResourceCalled('Directory', '/hadoop/mapred1',
       owner = 'mapred',
       recursive = True,
-      mode = 493,
+      mode = 0755,
     )
     self.assertResourceCalled('File', '/etc/hadoop/conf/mapred.exclude',
       owner = 'mapred',
@@ -150,7 +150,7 @@ class TestTasktracker(RMFTestCase):
     self.assertResourceCalled('Directory', '/hadoop/mapred',
       owner = 'mapred',
       recursive = True,
-      mode = 493,
+      mode = 0755,
     )
     self.assertResourceCalled('File', '/etc/hadoop/conf/mapred.exclude',
       owner = 'mapred',

+ 2 - 2
ambari-server/src/test/python/stacks/1.3.2/PIG/test_pig_service_check.py

@@ -41,7 +41,7 @@ class TestPigServiceCheck(RMFTestCase):
        
     self.assertResourceCalled('File', '/tmp/pigSmoke.sh',
       content = StaticFile('pigSmoke.sh'),
-      mode = 493,
+      mode = 0755,
     )
        
     self.assertResourceCalled('Execute', 'pig /tmp/pigSmoke.sh',
@@ -77,7 +77,7 @@ class TestPigServiceCheck(RMFTestCase):
        
     self.assertResourceCalled('File', '/tmp/pigSmoke.sh',
       content = StaticFile('pigSmoke.sh'),
-      mode = 493,
+      mode = 0755,
     )
        
     self.assertResourceCalled('Execute', 'pig /tmp/pigSmoke.sh',

+ 4 - 4
ambari-server/src/test/python/stacks/1.3.2/WEBHCAT/test_webhcat_server.py

@@ -128,13 +128,13 @@ class TestWebHCatServer(RMFTestCase):
       owner = 'hcat',
       group = 'hadoop',
       recursive = True,
-      mode = 493,
+      mode = 0755,
     )
     self.assertResourceCalled('Directory', '/var/log/webhcat',
       owner = 'hcat',
       group = 'hadoop',
       recursive = True,
-      mode = 493,
+      mode = 0755,
     )
     self.assertResourceCalled('Directory', '/etc/hcatalog/conf',
       owner = 'hcat',
@@ -200,13 +200,13 @@ class TestWebHCatServer(RMFTestCase):
       owner = 'hcat',
       group = 'hadoop',
       recursive = True,
-      mode = 493,
+      mode = 0755,
     )
     self.assertResourceCalled('Directory', '/var/log/webhcat',
       owner = 'hcat',
       group = 'hadoop',
       recursive = True,
-      mode = 493,
+      mode = 0755,
     )
     self.assertResourceCalled('Directory', '/etc/hcatalog/conf',
       owner = 'hcat',

+ 2 - 2
ambari-server/src/test/python/stacks/1.3.2/WEBHCAT/test_webhcat_service_check.py

@@ -31,7 +31,7 @@ class TestServiceCheck(RMFTestCase):
     )
     self.assertResourceCalled('File', '/tmp/templetonSmoke.sh',
                        content = StaticFile('templetonSmoke.sh'),
-                       mode = 493,
+                       mode = 0755,
     )
     self.assertResourceCalled('Execute', 'sh /tmp/templetonSmoke.sh c6402.ambari.apache.org ambari-qa no_keytab false /usr/bin/kinit',
                        logoutput = True,
@@ -50,7 +50,7 @@ class TestServiceCheck(RMFTestCase):
     )
     self.assertResourceCalled('File', '/tmp/templetonSmoke.sh',
                        content = StaticFile('templetonSmoke.sh'),
-                       mode = 493,
+                       mode = 0755,
     )
     self.assertResourceCalled('Execute', 'sh /tmp/templetonSmoke.sh c6402.ambari.apache.org ambari-qa /etc/security/keytabs/smokeuser.headless.keytab true /usr/bin/kinit',
                        logoutput = True,

+ 2 - 2
ambari-server/src/test/python/stacks/1.3.2/ZOOKEEPER/test_zookeeper_server.py

@@ -137,7 +137,7 @@ class TestZookeeperServer(RMFTestCase):
     )
     self.assertResourceCalled('File', '/hadoop/zookeeper/myid',
       content = '1',
-      mode = 420,
+      mode = 0644,
     )
     self.assertResourceCalled('PropertiesFile',
                               'log4j.properties',
@@ -191,7 +191,7 @@ class TestZookeeperServer(RMFTestCase):
     )
     self.assertResourceCalled('File', '/hadoop/zookeeper/myid',
       content = '1',
-      mode = 420,
+      mode = 0644,
     )
     self.assertResourceCalled('PropertiesFile',
                               'log4j.properties',

+ 2 - 2
ambari-server/src/test/python/stacks/1.3.2/ZOOKEEPER/test_zookeeper_service_check.py

@@ -31,7 +31,7 @@ class TestServiceCheck(RMFTestCase):
     )
     self.assertResourceCalled('File', '/tmp/zkSmoke.sh',
                        content = StaticFile('zkSmoke.sh'),
-                       mode = 493,
+                       mode = 0755,
     )
     self.assertResourceCalled('Execute', 'sh /tmp/zkSmoke.sh /usr/lib/zookeeper/bin/zkCli.sh ambari-qa /etc/zookeeper/conf 2181 False /usr/bin/kinit no_keytab',
                        logoutput = True,
@@ -50,7 +50,7 @@ class TestServiceCheck(RMFTestCase):
     )
     self.assertResourceCalled('File', '/tmp/zkSmoke.sh',
                        content = StaticFile('zkSmoke.sh'),
-                       mode = 493,
+                       mode = 0755,
     )
     self.assertResourceCalled('Execute', 'sh /tmp/zkSmoke.sh /usr/lib/zookeeper/bin/zkCli.sh ambari-qa /etc/zookeeper/conf 2181 True /usr/bin/kinit /etc/security/keytabs/smokeuser.headless.keytab',
                        logoutput = True,

+ 1 - 1
ambari-server/src/test/python/stacks/1.3.2/hooks/before-START/test_before_start.py

@@ -149,7 +149,7 @@ class TestHookBeforeStart(RMFTestCase):
     )
     self.assertResourceCalled('File', '/etc/hadoop/conf/task-log4j.properties',
       content = StaticFile('task-log4j.properties'),
-      mode = 493,
+      mode = 0755,
     )
     self.assertResourceCalled('XmlConfig', 'hdfs-site.xml',
       owner = 'hdfs',

+ 2 - 2
ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_client.py

@@ -37,7 +37,7 @@ class TestHiveClient(RMFTestCase):
     self.assertResourceCalled('XmlConfig', 'hive-site.xml',
       owner = 'hive',
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
       conf_dir = '/etc/hive/conf',
       configurations = self.getConfig()['configurations']['hive-site'],
     )
@@ -92,7 +92,7 @@ class TestHiveClient(RMFTestCase):
     self.assertResourceCalled('XmlConfig', 'hive-site.xml',
       owner = 'hive',
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
       conf_dir = '/etc/hive/conf',
       configurations = self.getConfig()['configurations']['hive-site'],
     )

+ 10 - 10
ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py

@@ -159,7 +159,7 @@ class TestHiveMetastore(RMFTestCase):
     self.assertResourceCalled('XmlConfig', 'hive-site.xml',
       owner = 'hive',
       group = 'hadoop',
-      mode = 384,
+      mode = 0600,
       conf_dir = '/etc/hive/conf.server',
       configurations = self.getConfig()['configurations']['hive-site'],
     )
@@ -168,24 +168,24 @@ class TestHiveMetastore(RMFTestCase):
     )
     self.assertResourceCalled('File', '/tmp/start_metastore_script',
       content = StaticFile('startMetastore.sh'),
-      mode = 493,
+      mode = 0755,
     )
     self.assertResourceCalled('Directory', '/var/run/hive',
       owner = 'hive',
       group = 'hadoop',
-      mode = 493,
+      mode = 0755,
       recursive = True,
     )
     self.assertResourceCalled('Directory', '/var/log/hive',
       owner = 'hive',
       group = 'hadoop',
-      mode = 493,
+      mode = 0755,
       recursive = True,
     )
     self.assertResourceCalled('Directory', '/var/lib/hive',
       owner = 'hive',
       group = 'hadoop',
-      mode = 493,
+      mode = 0755,
       recursive = True,
     )
     self.assertResourceCalled('File', '/etc/hive/conf.server/hive-env.sh',
@@ -216,7 +216,7 @@ class TestHiveMetastore(RMFTestCase):
     self.assertResourceCalled('XmlConfig', 'hive-site.xml',
       owner = 'hive',
       group = 'hadoop',
-      mode = 384,
+      mode = 0600,
       conf_dir = '/etc/hive/conf.server',
       configurations = self.getConfig()['configurations']['hive-site'],
     )
@@ -225,24 +225,24 @@ class TestHiveMetastore(RMFTestCase):
     )
     self.assertResourceCalled('File', '/tmp/start_metastore_script',
       content = StaticFile('startMetastore.sh'),
-      mode = 493,
+      mode = 0755,
     )
     self.assertResourceCalled('Directory', '/var/run/hive',
       owner = 'hive',
       group = 'hadoop',
-      mode = 493,
+      mode = 0755,
       recursive = True,
     )
     self.assertResourceCalled('Directory', '/var/log/hive',
       owner = 'hive',
       group = 'hadoop',
-      mode = 493,
+      mode = 0755,
       recursive = True,
     )
     self.assertResourceCalled('Directory', '/var/lib/hive',
       owner = 'hive',
       group = 'hadoop',
-      mode = 493,
+      mode = 0755,
       recursive = True,
     )
     self.assertResourceCalled('File', '/etc/hive/conf.server/hive-env.sh',

+ 10 - 10
ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py

@@ -255,7 +255,7 @@ class TestHiveServer(RMFTestCase):
     self.assertResourceCalled('XmlConfig', 'hive-site.xml',
       owner = 'hive',
       group = 'hadoop',
-      mode = 384,
+      mode = 0600,
       conf_dir = '/etc/hive/conf.server',
       configurations = self.getConfig()['configurations']['hive-site'],
     )
@@ -264,24 +264,24 @@ class TestHiveServer(RMFTestCase):
     )
     self.assertResourceCalled('File', '/tmp/start_hiveserver2_script',
       content = StaticFile('startHiveserver2.sh'),
-      mode = 493,
+      mode = 0755,
     )
     self.assertResourceCalled('Directory', '/var/run/hive',
       owner = 'hive',
       group = 'hadoop',
-      mode = 493,
+      mode = 0755,
       recursive = True,
     )
     self.assertResourceCalled('Directory', '/var/log/hive',
       owner = 'hive',
       group = 'hadoop',
-      mode = 493,
+      mode = 0755,
       recursive = True,
     )
     self.assertResourceCalled('Directory', '/var/lib/hive',
       owner = 'hive',
       group = 'hadoop',
-      mode = 493,
+      mode = 0755,
       recursive = True,
     )
     self.assertResourceCalled('File', '/etc/hive/conf.server/hive-env.sh',
@@ -341,7 +341,7 @@ class TestHiveServer(RMFTestCase):
     self.assertResourceCalled('XmlConfig', 'hive-site.xml',
       owner = 'hive',
       group = 'hadoop',
-      mode = 384,
+      mode = 0600,
       conf_dir = '/etc/hive/conf.server',
       configurations = self.getConfig()['configurations']['hive-site'],
     )
@@ -350,24 +350,24 @@ class TestHiveServer(RMFTestCase):
     )
     self.assertResourceCalled('File', '/tmp/start_hiveserver2_script',
       content = StaticFile('startHiveserver2.sh'),
-      mode = 493,
+      mode = 0755,
     )
     self.assertResourceCalled('Directory', '/var/run/hive',
       owner = 'hive',
       group = 'hadoop',
-      mode = 493,
+      mode = 0755,
       recursive = True,
     )
     self.assertResourceCalled('Directory', '/var/log/hive',
       owner = 'hive',
       group = 'hadoop',
-      mode = 493,
+      mode = 0755,
       recursive = True,
     )
     self.assertResourceCalled('Directory', '/var/lib/hive',
       owner = 'hive',
       group = 'hadoop',
-      mode = 493,
+      mode = 0755,
       recursive = True,
     )
     self.assertResourceCalled('File', '/etc/hive/conf.server/hive-env.sh',

+ 4 - 4
ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py

@@ -33,7 +33,7 @@ class TestServiceCheck(RMFTestCase):
     )
     self.assertResourceCalled('File', '/tmp/hiveserver2Smoke.sh',
                         content = StaticFile('hiveserver2Smoke.sh'),
-                        mode = 493,
+                        mode = 0755,
     )
     self.assertResourceCalled('File', '/tmp/hiveserver2.sql',
                         content = StaticFile('hiveserver2.sql'),
@@ -47,7 +47,7 @@ class TestServiceCheck(RMFTestCase):
     )
     self.assertResourceCalled('File', '/tmp/hcatSmoke.sh',
                         content = StaticFile('hcatSmoke.sh'),
-                        mode = 493,
+                        mode = 0755,
     )
     self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 sh /tmp/hcatSmoke.sh hcatsmoke prepare',
                         logoutput = True,
@@ -82,7 +82,7 @@ class TestServiceCheck(RMFTestCase):
     )
     self.assertResourceCalled('File', '/tmp/hiveserver2Smoke.sh',
                         content = StaticFile('hiveserver2Smoke.sh'),
-                        mode = 493,
+                        mode = 0755,
     )
     self.assertResourceCalled('File', '/tmp/hiveserver2.sql',
                         content = StaticFile('hiveserver2.sql'),
@@ -96,7 +96,7 @@ class TestServiceCheck(RMFTestCase):
     )
     self.assertResourceCalled('File', '/tmp/hcatSmoke.sh',
                         content = StaticFile('hcatSmoke.sh'),
-                        mode = 493,
+                        mode = 0755,
     )
     self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab ambari-qa; env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 sh /tmp/hcatSmoke.sh hcatsmoke prepare',
                         logoutput = True,

+ 2 - 2
ambari-server/src/test/python/stacks/2.0.6/HIVE/test_mysql_server.py

@@ -105,7 +105,7 @@ class TestMySqlServer(RMFTestCase):
     )
     self.assertResourceCalled('File', '/tmp/addMysqlUser.sh',
       content = StaticFile('addMysqlUser.sh'),
-      mode = 493,
+      mode = 0755,
     )
     self.assertResourceCalled('Execute', 'bash -x /tmp/addMysqlUser.sh mysql hive \'!`"\'"\'"\' 1\' c6402.ambari.apache.org',
       path = ['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'],
@@ -126,7 +126,7 @@ class TestMySqlServer(RMFTestCase):
     )
     self.assertResourceCalled('File', '/tmp/addMysqlUser.sh',
       content = StaticFile('addMysqlUser.sh'),
-      mode = 493,
+      mode = 0755,
     )
     self.assertResourceCalled('Execute', 'bash -x /tmp/addMysqlUser.sh mysql hive \'!`"\'"\'"\' 1\' c6402.ambari.apache.org',
       path = ['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'],

+ 2 - 2
ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_service_check.py

@@ -40,7 +40,7 @@ class TestPigServiceCheck(RMFTestCase):
        
     self.assertResourceCalled('File', '/tmp/pigSmoke.sh',
       content = StaticFile('pigSmoke.sh'),
-      mode = 493,
+      mode = 0755,
     )
        
     self.assertResourceCalled('Execute', 'pig /tmp/pigSmoke.sh',
@@ -76,7 +76,7 @@ class TestPigServiceCheck(RMFTestCase):
        
     self.assertResourceCalled('File', '/tmp/pigSmoke.sh',
       content = StaticFile('pigSmoke.sh'),
-      mode = 493,
+      mode = 0755,
     )
        
     self.assertResourceCalled('Execute', 'pig /tmp/pigSmoke.sh',

+ 4 - 4
ambari-server/src/test/python/stacks/2.0.6/WEBHCAT/test_webhcat_server.py

@@ -131,13 +131,13 @@ class TestWebHCatServer(RMFTestCase):
       owner = 'hcat',
       group = 'hadoop',
       recursive = True,
-      mode = 493,
+      mode = 0755,
     )
     self.assertResourceCalled('Directory', '/var/log/webhcat',
       owner = 'hcat',
       group = 'hadoop',
       recursive = True,
-      mode = 493,
+      mode = 0755,
     )
     self.assertResourceCalled('Directory', '/etc/hcatalog/conf',
       owner = 'hcat',
@@ -203,13 +203,13 @@ class TestWebHCatServer(RMFTestCase):
       owner = 'hcat',
       group = 'hadoop',
       recursive = True,
-      mode = 493,
+      mode = 0755,
     )
     self.assertResourceCalled('Directory', '/var/log/webhcat',
       owner = 'hcat',
       group = 'hadoop',
       recursive = True,
-      mode = 493,
+      mode = 0755,
     )
     self.assertResourceCalled('Directory', '/etc/hcatalog/conf',
       owner = 'hcat',

+ 2 - 2
ambari-server/src/test/python/stacks/2.0.6/WEBHCAT/test_webhcat_service_check.py

@@ -31,7 +31,7 @@ class TestServiceCheck(RMFTestCase):
     )
     self.assertResourceCalled('File', '/tmp/templetonSmoke.sh',
                        content = StaticFile('templetonSmoke.sh'),
-                       mode = 493,
+                       mode = 0755,
     )
     self.assertResourceCalled('Execute', 'sh /tmp/templetonSmoke.sh c6402.ambari.apache.org ambari-qa no_keytab false /usr/bin/kinit',
                        logoutput = True,
@@ -50,7 +50,7 @@ class TestServiceCheck(RMFTestCase):
     )
     self.assertResourceCalled('File', '/tmp/templetonSmoke.sh',
                        content = StaticFile('templetonSmoke.sh'),
-                       mode = 493,
+                       mode = 0755,
     )
     self.assertResourceCalled('Execute', 'sh /tmp/templetonSmoke.sh c6402.ambari.apache.org ambari-qa /etc/security/keytabs/smokeuser.headless.keytab true /usr/bin/kinit',
                        logoutput = True,

+ 16 - 16
ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py

@@ -213,28 +213,28 @@ class TestHistoryServer(RMFTestCase):
     self.assertResourceCalled('XmlConfig', 'core-site.xml',
       owner = 'hdfs',
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
       conf_dir = '/etc/hadoop/conf',
       configurations = self.getConfig()['configurations']['core-site'],
     )
     self.assertResourceCalled('XmlConfig', 'mapred-site.xml',
       owner = 'yarn',
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
       conf_dir = '/etc/hadoop/conf',
       configurations = self.getConfig()['configurations']['mapred-site'],
     )
     self.assertResourceCalled('XmlConfig', 'yarn-site.xml',
       owner = 'yarn',
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
       conf_dir = '/etc/hadoop/conf',
       configurations = self.getConfig()['configurations']['yarn-site'],
     )
     self.assertResourceCalled('XmlConfig', 'capacity-scheduler.xml',
       owner = 'yarn',
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
       conf_dir = '/etc/hadoop/conf',
       configurations = self.getConfig()['configurations']['capacity-scheduler'],
     )
@@ -248,17 +248,17 @@ class TestHistoryServer(RMFTestCase):
     )
     self.assertResourceCalled('File', '/etc/security/limits.d/yarn.conf',
       content = Template('yarn.conf.j2'),
-      mode = 420,
+      mode = 0644,
     )
     self.assertResourceCalled('File', '/etc/security/limits.d/mapreduce.conf',
       content = Template('mapreduce.conf.j2'),
-      mode = 420,
+      mode = 0644,
     )
     self.assertResourceCalled('File', '/etc/hadoop/conf/yarn-env.sh',
       content = Template('yarn-env.sh.j2'),
       owner = 'yarn',
       group = 'hadoop',
-      mode = 493,
+      mode = 0755,
     )
 
   def assert_configure_secured(self):
@@ -357,28 +357,28 @@ class TestHistoryServer(RMFTestCase):
     self.assertResourceCalled('XmlConfig', 'core-site.xml',
       owner = 'hdfs',
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
       conf_dir = '/etc/hadoop/conf',
       configurations = self.getConfig()['configurations']['core-site'],
     )
     self.assertResourceCalled('XmlConfig', 'mapred-site.xml',
       owner = 'yarn',
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
       conf_dir = '/etc/hadoop/conf',
       configurations = self.getConfig()['configurations']['mapred-site'],
     )
     self.assertResourceCalled('XmlConfig', 'yarn-site.xml',
       owner = 'yarn',
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
       conf_dir = '/etc/hadoop/conf',
       configurations = self.getConfig()['configurations']['yarn-site'],
     )
     self.assertResourceCalled('XmlConfig', 'capacity-scheduler.xml',
       owner = 'yarn',
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
       conf_dir = '/etc/hadoop/conf',
       configurations = self.getConfig()['configurations']['capacity-scheduler'],
     )
@@ -392,24 +392,24 @@ class TestHistoryServer(RMFTestCase):
     )
     self.assertResourceCalled('File', '/etc/security/limits.d/yarn.conf',
       content = Template('yarn.conf.j2'),
-      mode = 420,
+      mode = 0644,
     )
     self.assertResourceCalled('File', '/etc/security/limits.d/mapreduce.conf',
       content = Template('mapreduce.conf.j2'),
-      mode = 420,
+      mode = 0644,
     )
     self.assertResourceCalled('File', '/etc/hadoop/conf/yarn-env.sh',
       content = Template('yarn-env.sh.j2'),
       owner = 'yarn',
       group = 'hadoop',
-      mode = 493,
+      mode = 0755,
     )
     self.assertResourceCalled('File', '/usr/lib/hadoop-yarn/bin/container-executor',
       group = 'hadoop',
-      mode = 3112,
+      mode = 06050,
     )
     self.assertResourceCalled('File', '/etc/hadoop/conf/container-executor.cfg',
       content = Template('container-executor.cfg.j2'),
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
     )

+ 16 - 16
ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_client.py

@@ -72,28 +72,28 @@ class TestMapReduce2Client(RMFTestCase):
     self.assertResourceCalled('XmlConfig', 'core-site.xml',
       owner = 'hdfs',
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
       conf_dir = '/etc/hadoop/conf',
       configurations = self.getConfig()['configurations']['core-site'],
     )
     self.assertResourceCalled('XmlConfig', 'mapred-site.xml',
       owner = 'yarn',
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
       conf_dir = '/etc/hadoop/conf',
       configurations = self.getConfig()['configurations']['mapred-site'],
     )
     self.assertResourceCalled('XmlConfig', 'yarn-site.xml',
       owner = 'yarn',
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
       conf_dir = '/etc/hadoop/conf',
       configurations = self.getConfig()['configurations']['yarn-site'],
     )
     self.assertResourceCalled('XmlConfig', 'capacity-scheduler.xml',
       owner = 'yarn',
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
       conf_dir = '/etc/hadoop/conf',
       configurations = self.getConfig()['configurations']['capacity-scheduler'],
     )
@@ -107,17 +107,17 @@ class TestMapReduce2Client(RMFTestCase):
     )
     self.assertResourceCalled('File', '/etc/security/limits.d/yarn.conf',
       content = Template('yarn.conf.j2'),
-      mode = 420,
+      mode = 0644,
     )
     self.assertResourceCalled('File', '/etc/security/limits.d/mapreduce.conf',
       content = Template('mapreduce.conf.j2'),
-      mode = 420,
+      mode = 0644,
     )
     self.assertResourceCalled('File', '/etc/hadoop/conf/yarn-env.sh',
       content = Template('yarn-env.sh.j2'),
       owner = 'yarn',
       group = 'hadoop',
-      mode = 493,
+      mode = 0755,
     )
     self.assertNoMoreResources()
 
@@ -163,28 +163,28 @@ class TestMapReduce2Client(RMFTestCase):
     self.assertResourceCalled('XmlConfig', 'core-site.xml',
       owner = 'hdfs',
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
       conf_dir = '/etc/hadoop/conf',
       configurations = self.getConfig()['configurations']['core-site'],
     )
     self.assertResourceCalled('XmlConfig', 'mapred-site.xml',
       owner = 'yarn',
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
       conf_dir = '/etc/hadoop/conf',
       configurations = self.getConfig()['configurations']['mapred-site'],
     )
     self.assertResourceCalled('XmlConfig', 'yarn-site.xml',
       owner = 'yarn',
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
       conf_dir = '/etc/hadoop/conf',
       configurations = self.getConfig()['configurations']['yarn-site'],
     )
     self.assertResourceCalled('XmlConfig', 'capacity-scheduler.xml',
       owner = 'yarn',
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
       conf_dir = '/etc/hadoop/conf',
       configurations = self.getConfig()['configurations']['capacity-scheduler'],
     )
@@ -198,26 +198,26 @@ class TestMapReduce2Client(RMFTestCase):
     )
     self.assertResourceCalled('File', '/etc/security/limits.d/yarn.conf',
       content = Template('yarn.conf.j2'),
-      mode = 420,
+      mode = 0644,
     )
     self.assertResourceCalled('File', '/etc/security/limits.d/mapreduce.conf',
       content = Template('mapreduce.conf.j2'),
-      mode = 420,
+      mode = 0644,
     )
     self.assertResourceCalled('File', '/etc/hadoop/conf/yarn-env.sh',
       content = Template('yarn-env.sh.j2'),
       owner = 'yarn',
       group = 'hadoop',
-      mode = 493,
+      mode = 0755,
     )
     self.assertResourceCalled('File', '/usr/lib/hadoop-yarn/bin/container-executor',
       group = 'hadoop',
-      mode = 3112,
+      mode = 06050,
     )
     self.assertResourceCalled('File', '/etc/hadoop/conf/container-executor.cfg',
       content = Template('container-executor.cfg.j2'),
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
     )
     self.assertNoMoreResources()
 

+ 16 - 16
ambari-server/src/test/python/stacks/2.0.6/YARN/test_nodemanager.py

@@ -213,28 +213,28 @@ class TestNodeManager(RMFTestCase):
     self.assertResourceCalled('XmlConfig', 'core-site.xml',
       owner = 'hdfs',
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
       conf_dir = '/etc/hadoop/conf',
       configurations = self.getConfig()['configurations']['core-site'],
     )
     self.assertResourceCalled('XmlConfig', 'mapred-site.xml',
       owner = 'yarn',
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
       conf_dir = '/etc/hadoop/conf',
       configurations = self.getConfig()['configurations']['mapred-site'],
     )
     self.assertResourceCalled('XmlConfig', 'yarn-site.xml',
       owner = 'yarn',
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
       conf_dir = '/etc/hadoop/conf',
       configurations = self.getConfig()['configurations']['yarn-site'],
     )
     self.assertResourceCalled('XmlConfig', 'capacity-scheduler.xml',
       owner = 'yarn',
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
       conf_dir = '/etc/hadoop/conf',
       configurations = self.getConfig()['configurations']['capacity-scheduler'],
     )
@@ -248,17 +248,17 @@ class TestNodeManager(RMFTestCase):
     )
     self.assertResourceCalled('File', '/etc/security/limits.d/yarn.conf',
       content = Template('yarn.conf.j2'),
-      mode = 420,
+      mode = 0644,
     )
     self.assertResourceCalled('File', '/etc/security/limits.d/mapreduce.conf',
       content = Template('mapreduce.conf.j2'),
-      mode = 420,
+      mode = 0644,
     )
     self.assertResourceCalled('File', '/etc/hadoop/conf/yarn-env.sh',
       content = Template('yarn-env.sh.j2'),
       owner = 'yarn',
       group = 'hadoop',
-      mode = 493,
+      mode = 0755,
     )
 
   def assert_configure_secured(self):
@@ -357,28 +357,28 @@ class TestNodeManager(RMFTestCase):
     self.assertResourceCalled('XmlConfig', 'core-site.xml',
       owner = 'hdfs',
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
       conf_dir = '/etc/hadoop/conf',
       configurations = self.getConfig()['configurations']['core-site'],
     )
     self.assertResourceCalled('XmlConfig', 'mapred-site.xml',
       owner = 'yarn',
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
       conf_dir = '/etc/hadoop/conf',
       configurations = self.getConfig()['configurations']['mapred-site'],
     )
     self.assertResourceCalled('XmlConfig', 'yarn-site.xml',
       owner = 'yarn',
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
       conf_dir = '/etc/hadoop/conf',
       configurations = self.getConfig()['configurations']['yarn-site'],
     )
     self.assertResourceCalled('XmlConfig', 'capacity-scheduler.xml',
       owner = 'yarn',
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
       conf_dir = '/etc/hadoop/conf',
       configurations = self.getConfig()['configurations']['capacity-scheduler'],
     )
@@ -392,25 +392,25 @@ class TestNodeManager(RMFTestCase):
     )
     self.assertResourceCalled('File', '/etc/security/limits.d/yarn.conf',
       content = Template('yarn.conf.j2'),
-      mode = 420,
+      mode = 0644,
     )
     self.assertResourceCalled('File', '/etc/security/limits.d/mapreduce.conf',
       content = Template('mapreduce.conf.j2'),
-      mode = 420,
+      mode = 0644,
     )
     self.assertResourceCalled('File', '/etc/hadoop/conf/yarn-env.sh',
       content = Template('yarn-env.sh.j2'),
       owner = 'yarn',
       group = 'hadoop',
-      mode = 493,
+      mode = 0755,
     )
     self.assertResourceCalled('File', '/usr/lib/hadoop-yarn/bin/container-executor',
       group = 'hadoop',
-      mode = 3112,
+      mode = 06050,
     )
     self.assertResourceCalled('File', '/etc/hadoop/conf/container-executor.cfg',
       content = Template('container-executor.cfg.j2'),
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
     )
     

+ 16 - 16
ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py

@@ -153,28 +153,28 @@ class TestResourceManager(RMFTestCase):
     self.assertResourceCalled('XmlConfig', 'core-site.xml',
       owner = 'hdfs',
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
       conf_dir = '/etc/hadoop/conf',
       configurations = self.getConfig()['configurations']['core-site'],
     )
     self.assertResourceCalled('XmlConfig', 'mapred-site.xml',
       owner = 'yarn',
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
       conf_dir = '/etc/hadoop/conf',
       configurations = self.getConfig()['configurations']['mapred-site'],
     )
     self.assertResourceCalled('XmlConfig', 'yarn-site.xml',
       owner = 'yarn',
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
       conf_dir = '/etc/hadoop/conf',
       configurations = self.getConfig()['configurations']['yarn-site'],
     )
     self.assertResourceCalled('XmlConfig', 'capacity-scheduler.xml',
       owner = 'yarn',
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
       conf_dir = '/etc/hadoop/conf',
       configurations = self.getConfig()['configurations']['capacity-scheduler'],
     )
@@ -188,17 +188,17 @@ class TestResourceManager(RMFTestCase):
     )
     self.assertResourceCalled('File', '/etc/security/limits.d/yarn.conf',
       content = Template('yarn.conf.j2'),
-      mode = 420,
+      mode = 0644,
     )
     self.assertResourceCalled('File', '/etc/security/limits.d/mapreduce.conf',
       content = Template('mapreduce.conf.j2'),
-      mode = 420,
+      mode = 0644,
     )
     self.assertResourceCalled('File', '/etc/hadoop/conf/yarn-env.sh',
       content = Template('yarn-env.sh.j2'),
       owner = 'yarn',
       group = 'hadoop',
-      mode = 493,
+      mode = 0755,
     )
 
   def assert_configure_secured(self):
@@ -238,28 +238,28 @@ class TestResourceManager(RMFTestCase):
     self.assertResourceCalled('XmlConfig', 'core-site.xml',
       owner = 'hdfs',
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
       conf_dir = '/etc/hadoop/conf',
       configurations = self.getConfig()['configurations']['core-site'],
     )
     self.assertResourceCalled('XmlConfig', 'mapred-site.xml',
       owner = 'yarn',
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
       conf_dir = '/etc/hadoop/conf',
       configurations = self.getConfig()['configurations']['mapred-site'],
     )
     self.assertResourceCalled('XmlConfig', 'yarn-site.xml',
       owner = 'yarn',
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
       conf_dir = '/etc/hadoop/conf',
       configurations = self.getConfig()['configurations']['yarn-site'],
     )
     self.assertResourceCalled('XmlConfig', 'capacity-scheduler.xml',
       owner = 'yarn',
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
       conf_dir = '/etc/hadoop/conf',
       configurations = self.getConfig()['configurations']['capacity-scheduler'],
     )
@@ -273,24 +273,24 @@ class TestResourceManager(RMFTestCase):
     )
     self.assertResourceCalled('File', '/etc/security/limits.d/yarn.conf',
       content = Template('yarn.conf.j2'),
-      mode = 420,
+      mode = 0644,
     )
     self.assertResourceCalled('File', '/etc/security/limits.d/mapreduce.conf',
       content = Template('mapreduce.conf.j2'),
-      mode = 420,
+      mode = 0644,
     )
     self.assertResourceCalled('File', '/etc/hadoop/conf/yarn-env.sh',
       content = Template('yarn-env.sh.j2'),
       owner = 'yarn',
       group = 'hadoop',
-      mode = 493,
+      mode = 0755,
     )
     self.assertResourceCalled('File', '/usr/lib/hadoop-yarn/bin/container-executor',
       group = 'hadoop',
-      mode = 3112,
+      mode = 06050,
     )
     self.assertResourceCalled('File', '/etc/hadoop/conf/container-executor.cfg',
       content = Template('container-executor.cfg.j2'),
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
     )

+ 23 - 23
ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_client.py

@@ -73,28 +73,28 @@ class TestYarnClient(RMFTestCase):
     self.assertResourceCalled('XmlConfig', 'core-site.xml',
       owner = 'hdfs',
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
       conf_dir = '/etc/hadoop/conf',
       configurations = self.getConfig()['configurations']['core-site'],
     )
     self.assertResourceCalled('XmlConfig', 'mapred-site.xml',
       owner = 'yarn',
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
       conf_dir = '/etc/hadoop/conf',
       configurations = self.getConfig()['configurations']['mapred-site'],
     )
     self.assertResourceCalled('XmlConfig', 'yarn-site.xml',
       owner = 'yarn',
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
       conf_dir = '/etc/hadoop/conf',
       configurations = self.getConfig()['configurations']['yarn-site'],
     )
     self.assertResourceCalled('XmlConfig', 'capacity-scheduler.xml',
       owner = 'yarn',
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
       conf_dir = '/etc/hadoop/conf',
       configurations = self.getConfig()['configurations']['capacity-scheduler'],
     )
@@ -108,17 +108,17 @@ class TestYarnClient(RMFTestCase):
     )
     self.assertResourceCalled('File', '/etc/security/limits.d/yarn.conf',
       content = Template('yarn.conf.j2'),
-      mode = 420,
+      mode = 0644,
     )
     self.assertResourceCalled('File', '/etc/security/limits.d/mapreduce.conf',
       content = Template('mapreduce.conf.j2'),
-      mode = 420,
+      mode = 0644,
     )
     self.assertResourceCalled('File', '/etc/hadoop/conf/yarn-env.sh',
       content = Template('yarn-env.sh.j2'),
       owner = 'yarn',
       group = 'hadoop',
-      mode = 493,
+      mode = 0755,
     )
     self.assertNoMoreResources()
 
@@ -164,28 +164,28 @@ class TestYarnClient(RMFTestCase):
     self.assertResourceCalled('XmlConfig', 'core-site.xml',
       owner = 'hdfs',
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
       conf_dir = '/etc/hadoop/conf',
       configurations = self.getConfig()['configurations']['core-site'],
     )
     self.assertResourceCalled('XmlConfig', 'mapred-site.xml',
       owner = 'yarn',
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
       conf_dir = '/etc/hadoop/conf',
       configurations = self.getConfig()['configurations']['mapred-site'],
     )
     self.assertResourceCalled('XmlConfig', 'yarn-site.xml',
       owner = 'yarn',
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
       conf_dir = '/etc/hadoop/conf',
       configurations = self.getConfig()['configurations']['yarn-site'],
     )
     self.assertResourceCalled('XmlConfig', 'capacity-scheduler.xml',
       owner = 'yarn',
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
       conf_dir = '/etc/hadoop/conf',
       configurations = self.getConfig()['configurations']['capacity-scheduler'],
     )
@@ -199,26 +199,26 @@ class TestYarnClient(RMFTestCase):
     )
     self.assertResourceCalled('File', '/etc/security/limits.d/yarn.conf',
       content = Template('yarn.conf.j2'),
-      mode = 420,
+      mode = 0644,
     )
     self.assertResourceCalled('File', '/etc/security/limits.d/mapreduce.conf',
       content = Template('mapreduce.conf.j2'),
-      mode = 420,
+      mode = 0644,
     )
     self.assertResourceCalled('File', '/etc/hadoop/conf/yarn-env.sh',
       content = Template('yarn-env.sh.j2'),
       owner = 'yarn',
       group = 'hadoop',
-      mode = 493,
+      mode = 0755,
     )
     self.assertResourceCalled('File', '/usr/lib/hadoop-yarn/bin/container-executor',
       group = 'hadoop',
-      mode = 3112,
+      mode = 06050,
     )
     self.assertResourceCalled('File', '/etc/hadoop/conf/container-executor.cfg',
       content = Template('container-executor.cfg.j2'),
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
     )
     self.assertNoMoreResources()
 
@@ -273,28 +273,28 @@ class TestYarnClient(RMFTestCase):
     self.assertResourceCalled('XmlConfig', 'core-site.xml',
       owner = 'hdfs',
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
       conf_dir = '/etc/hadoop/conf',
       configurations = self.getConfig()['configurations']['core-site'],
     )
     self.assertResourceCalled('XmlConfig', 'mapred-site.xml',
       owner = 'yarn',
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
       conf_dir = '/etc/hadoop/conf',
       configurations = self.getConfig()['configurations']['mapred-site'],
     )
     self.assertResourceCalled('XmlConfig', 'yarn-site.xml',
       owner = 'yarn',
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
       conf_dir = '/etc/hadoop/conf',
       configurations = self.getConfig()['configurations']['yarn-site'],
     )
     self.assertResourceCalled('XmlConfig', 'capacity-scheduler.xml',
       owner = 'yarn',
       group = 'hadoop',
-      mode = 420,
+      mode = 0644,
       conf_dir = '/etc/hadoop/conf',
       configurations = self.getConfig()['configurations']['capacity-scheduler'],
     )
@@ -308,17 +308,17 @@ class TestYarnClient(RMFTestCase):
     )
     self.assertResourceCalled('File', '/etc/security/limits.d/yarn.conf',
       content = Template('yarn.conf.j2'),
-      mode = 420,
+      mode = 0644,
     )
     self.assertResourceCalled('File', '/etc/security/limits.d/mapreduce.conf',
       content = Template('mapreduce.conf.j2'),
-      mode = 420,
+      mode = 0644,
     )
     self.assertResourceCalled('File', '/etc/hadoop/conf/yarn-env.sh',
       content = Template('yarn-env.sh.j2'),
       owner = 'yarn',
       group = 'hadoop',
-      mode = 493,
+      mode = 0755,
     )
     self.assertNoMoreResources()
 

+ 2 - 2
ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_service_check.py

@@ -32,7 +32,7 @@ class TestServiceCheck(RMFTestCase):
     )
     self.assertResourceCalled('File', '/tmp/validateYarnComponentStatus.py',
                           content = StaticFile('validateYarnComponentStatus.py'),
-                          mode = 493,
+                          mode = 0755,
     )
     self.assertResourceCalled('Execute', '/usr/bin/python2.6 /tmp/validateYarnComponentStatus.py rm -p c6402.ambari.apache.org:8088 -s False',
                           logoutput = True,
@@ -54,7 +54,7 @@ class TestServiceCheck(RMFTestCase):
     )
     self.assertResourceCalled('File', '/tmp/validateYarnComponentStatus.py',
                           content = StaticFile('validateYarnComponentStatus.py'),
-                          mode = 493,
+                          mode = 0755,
     )
     self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab ambari-qa; /usr/bin/python2.6 /tmp/validateYarnComponentStatus.py rm -p c6402.ambari.apache.org:8088 -s False',
                           logoutput = True,

+ 2 - 2
ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py

@@ -134,7 +134,7 @@ class TestZookeeperServer(RMFTestCase):
     )
     self.assertResourceCalled('File', '/hadoop/zookeeper/myid',
       content = '1',
-      mode = 420,
+      mode = 0644,
     )
     self.assertResourceCalled('PropertiesFile',
                               'log4j.properties',
@@ -187,7 +187,7 @@ class TestZookeeperServer(RMFTestCase):
     )
     self.assertResourceCalled('File', '/hadoop/zookeeper/myid',
       content = '1',
-      mode = 420,
+      mode = 0644,
     )
     self.assertResourceCalled('PropertiesFile',
                               'log4j.properties',

+ 2 - 2
ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_service_check.py

@@ -31,7 +31,7 @@ class TestServiceCheck(RMFTestCase):
     )
     self.assertResourceCalled('File', '/tmp/zkSmoke.sh',
                        content = StaticFile('zkSmoke.sh'),
-                       mode = 493,
+                       mode = 0755,
     )
     self.assertResourceCalled('Execute', 'sh /tmp/zkSmoke.sh /usr/lib/zookeeper/bin/zkCli.sh ambari-qa /etc/zookeeper/conf 2181 False /usr/bin/kinit no_keytab',
                        logoutput = True,
@@ -50,7 +50,7 @@ class TestServiceCheck(RMFTestCase):
     )
     self.assertResourceCalled('File', '/tmp/zkSmoke.sh',
                        content = StaticFile('zkSmoke.sh'),
-                       mode = 493,
+                       mode = 0755,
     )
     self.assertResourceCalled('Execute', 'sh /tmp/zkSmoke.sh /usr/lib/zookeeper/bin/zkCli.sh ambari-qa /etc/zookeeper/conf 2181 True /usr/bin/kinit /etc/security/keytabs/smokeuser.headless.keytab',
                        logoutput = True,