Quellcode durchsuchen

AMBARI-6892. YARN unit-tests contains un-existed "mapred-queue-acls.xml" test resource (aonishuk)

Andrew Onishuk vor 11 Jahren
Ursprung
Commit
eefa2fd57b

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

@@ -285,10 +285,6 @@ class TestHistoryServer(RMFTestCase):
                               configurations = self.getConfig()['configurations']['mapred-site'],
                               configurations = self.getConfig()['configurations']['mapred-site'],
                               configuration_attributes = self.getConfig()['configuration_attributes']['mapred-site']
                               configuration_attributes = self.getConfig()['configuration_attributes']['mapred-site']
                               )
                               )
-    self.assertResourceCalled('File', '/etc/hadoop/conf/mapred-queue-acls.xml',
-                              owner = 'mapred',
-                              group = 'hadoop',
-                              )
     self.assertResourceCalled('XmlConfig', 'capacity-scheduler.xml',
     self.assertResourceCalled('XmlConfig', 'capacity-scheduler.xml',
                               owner = 'hdfs',
                               owner = 'hdfs',
                               group = 'hadoop',
                               group = 'hadoop',
@@ -486,10 +482,6 @@ class TestHistoryServer(RMFTestCase):
                               configurations = self.getConfig()['configurations']['mapred-site'],
                               configurations = self.getConfig()['configurations']['mapred-site'],
                               configuration_attributes = self.getConfig()['configuration_attributes']['mapred-site']
                               configuration_attributes = self.getConfig()['configuration_attributes']['mapred-site']
                               )
                               )
-    self.assertResourceCalled('File', '/etc/hadoop/conf/mapred-queue-acls.xml',
-                              owner = 'mapred',
-                              group = 'hadoop',
-                              )
     self.assertResourceCalled('XmlConfig', 'capacity-scheduler.xml',
     self.assertResourceCalled('XmlConfig', 'capacity-scheduler.xml',
                               owner = 'hdfs',
                               owner = 'hdfs',
                               group = 'hadoop',
                               group = 'hadoop',

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

@@ -144,10 +144,6 @@ class TestMapReduce2Client(RMFTestCase):
                               configurations = self.getConfig()['configurations']['mapred-site'],
                               configurations = self.getConfig()['configurations']['mapred-site'],
                               configuration_attributes = self.getConfig()['configuration_attributes']['mapred-site']
                               configuration_attributes = self.getConfig()['configuration_attributes']['mapred-site']
                               )
                               )
-    self.assertResourceCalled('File', '/etc/hadoop/conf/mapred-queue-acls.xml',
-                              owner = 'mapred',
-                              group = 'hadoop',
-                              )
     self.assertResourceCalled('XmlConfig', 'capacity-scheduler.xml',
     self.assertResourceCalled('XmlConfig', 'capacity-scheduler.xml',
                               owner = 'hdfs',
                               owner = 'hdfs',
                               group = 'hadoop',
                               group = 'hadoop',
@@ -292,10 +288,6 @@ class TestMapReduce2Client(RMFTestCase):
                               configurations = self.getConfig()['configurations']['mapred-site'],
                               configurations = self.getConfig()['configurations']['mapred-site'],
                               configuration_attributes = self.getConfig()['configuration_attributes']['mapred-site']
                               configuration_attributes = self.getConfig()['configuration_attributes']['mapred-site']
                               )
                               )
-    self.assertResourceCalled('File', '/etc/hadoop/conf/mapred-queue-acls.xml',
-                              owner = 'mapred',
-                              group = 'hadoop',
-                              )
     self.assertResourceCalled('XmlConfig', 'capacity-scheduler.xml',
     self.assertResourceCalled('XmlConfig', 'capacity-scheduler.xml',
                               owner = 'hdfs',
                               owner = 'hdfs',
                               group = 'hadoop',
                               group = 'hadoop',

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

@@ -285,10 +285,6 @@ class TestNodeManager(RMFTestCase):
                               configurations = self.getConfig()['configurations']['mapred-site'],
                               configurations = self.getConfig()['configurations']['mapred-site'],
                               configuration_attributes = self.getConfig()['configuration_attributes']['mapred-site']
                               configuration_attributes = self.getConfig()['configuration_attributes']['mapred-site']
                               )
                               )
-    self.assertResourceCalled('File', '/etc/hadoop/conf/mapred-queue-acls.xml',
-                              owner = 'mapred',
-                              group = 'hadoop',
-                              )
     self.assertResourceCalled('XmlConfig', 'capacity-scheduler.xml',
     self.assertResourceCalled('XmlConfig', 'capacity-scheduler.xml',
                               owner = 'hdfs',
                               owner = 'hdfs',
                               group = 'hadoop',
                               group = 'hadoop',
@@ -486,10 +482,6 @@ class TestNodeManager(RMFTestCase):
                               configurations = self.getConfig()['configurations']['mapred-site'],
                               configurations = self.getConfig()['configurations']['mapred-site'],
                               configuration_attributes = self.getConfig()['configuration_attributes']['mapred-site']
                               configuration_attributes = self.getConfig()['configuration_attributes']['mapred-site']
                               )
                               )
-    self.assertResourceCalled('File', '/etc/hadoop/conf/mapred-queue-acls.xml',
-                              owner = 'mapred',
-                              group = 'hadoop',
-                              )
     self.assertResourceCalled('XmlConfig', 'capacity-scheduler.xml',
     self.assertResourceCalled('XmlConfig', 'capacity-scheduler.xml',
                               owner = 'hdfs',
                               owner = 'hdfs',
                               group = 'hadoop',
                               group = 'hadoop',

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

@@ -229,10 +229,6 @@ class TestResourceManager(RMFTestCase):
                               configurations = self.getConfig()['configurations']['mapred-site'],
                               configurations = self.getConfig()['configurations']['mapred-site'],
                               configuration_attributes = self.getConfig()['configuration_attributes']['mapred-site']
                               configuration_attributes = self.getConfig()['configuration_attributes']['mapred-site']
                               )
                               )
-    self.assertResourceCalled('File', '/etc/hadoop/conf/mapred-queue-acls.xml',
-                              owner = 'mapred',
-                              group = 'hadoop',
-                              )
     self.assertResourceCalled('XmlConfig', 'capacity-scheduler.xml',
     self.assertResourceCalled('XmlConfig', 'capacity-scheduler.xml',
                               owner = 'hdfs',
                               owner = 'hdfs',
                               group = 'hadoop',
                               group = 'hadoop',
@@ -375,10 +371,6 @@ class TestResourceManager(RMFTestCase):
                               configurations = self.getConfig()['configurations']['mapred-site'],
                               configurations = self.getConfig()['configurations']['mapred-site'],
                               configuration_attributes = self.getConfig()['configuration_attributes']['mapred-site']
                               configuration_attributes = self.getConfig()['configuration_attributes']['mapred-site']
                               )
                               )
-    self.assertResourceCalled('File', '/etc/hadoop/conf/mapred-queue-acls.xml',
-                              owner = 'mapred',
-                              group = 'hadoop',
-                              )
     self.assertResourceCalled('XmlConfig', 'capacity-scheduler.xml',
     self.assertResourceCalled('XmlConfig', 'capacity-scheduler.xml',
                               owner = 'hdfs',
                               owner = 'hdfs',
                               group = 'hadoop',
                               group = 'hadoop',

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

@@ -145,10 +145,6 @@ class TestYarnClient(RMFTestCase):
                               configurations = self.getConfig()['configurations']['mapred-site'],
                               configurations = self.getConfig()['configurations']['mapred-site'],
                               configuration_attributes = self.getConfig()['configuration_attributes']['mapred-site']
                               configuration_attributes = self.getConfig()['configuration_attributes']['mapred-site']
                               )
                               )
-    self.assertResourceCalled('File', '/etc/hadoop/conf/mapred-queue-acls.xml',
-                              owner = 'mapred',
-                              group = 'hadoop',
-                              )
     self.assertResourceCalled('XmlConfig', 'capacity-scheduler.xml',
     self.assertResourceCalled('XmlConfig', 'capacity-scheduler.xml',
                               owner = 'hdfs',
                               owner = 'hdfs',
                               group = 'hadoop',
                               group = 'hadoop',
@@ -293,10 +289,6 @@ class TestYarnClient(RMFTestCase):
                               configurations = self.getConfig()['configurations']['mapred-site'],
                               configurations = self.getConfig()['configurations']['mapred-site'],
                               configuration_attributes = self.getConfig()['configuration_attributes']['mapred-site']
                               configuration_attributes = self.getConfig()['configuration_attributes']['mapred-site']
                               )
                               )
-    self.assertResourceCalled('File', '/etc/hadoop/conf/mapred-queue-acls.xml',
-                              owner = 'mapred',
-                              group = 'hadoop',
-                              )
     self.assertResourceCalled('XmlConfig', 'capacity-scheduler.xml',
     self.assertResourceCalled('XmlConfig', 'capacity-scheduler.xml',
                               owner = 'hdfs',
                               owner = 'hdfs',
                               group = 'hadoop',
                               group = 'hadoop',
@@ -436,10 +428,6 @@ class TestYarnClient(RMFTestCase):
                               configurations = self.getConfig()['configurations']['mapred-site'],
                               configurations = self.getConfig()['configurations']['mapred-site'],
                               configuration_attributes = self.getConfig()['configuration_attributes']['mapred-site']
                               configuration_attributes = self.getConfig()['configuration_attributes']['mapred-site']
                               )
                               )
-    self.assertResourceCalled('File', '/etc/hadoop/conf/mapred-queue-acls.xml',
-                              owner = 'mapred',
-                              group = 'hadoop',
-                              )
     self.assertResourceCalled('XmlConfig', 'capacity-scheduler.xml',
     self.assertResourceCalled('XmlConfig', 'capacity-scheduler.xml',
                               owner = 'hdfs',
                               owner = 'hdfs',
                               group = 'hadoop',
                               group = 'hadoop',

+ 0 - 4
ambari-server/src/test/python/stacks/2.1/YARN/test_apptimelineserver.py

@@ -184,10 +184,6 @@ class TestAppTimelineServer(RMFTestCase):
                               configurations = self.getConfig()['configurations']['mapred-site'],
                               configurations = self.getConfig()['configurations']['mapred-site'],
                               configuration_attributes = self.getConfig()['configuration_attributes']['mapred-site']
                               configuration_attributes = self.getConfig()['configuration_attributes']['mapred-site']
                               )
                               )
-    self.assertResourceCalled('File', '/etc/hadoop/conf/mapred-queue-acls.xml',
-                              owner = 'mapred',
-                              group = 'hadoop',
-                              )
     self.assertResourceCalled('XmlConfig', 'capacity-scheduler.xml',
     self.assertResourceCalled('XmlConfig', 'capacity-scheduler.xml',
                               owner = 'hdfs',
                               owner = 'hdfs',
                               group = 'hadoop',
                               group = 'hadoop',