AMBARI-6892. YARN unit-tests contains un-existed "mapred-queue-acls.xml" test resource (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/eefa2fd5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/eefa2fd5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/eefa2fd5 Branch: refs/heads/branch-alerts-dev Commit: eefa2fd57ba0e747f9b894bacc25084633395564 Parents: 947899e Author: Andrew Onishuk <aonis...@hortonworks.com> Authored: Mon Aug 18 20:09:46 2014 +0300 Committer: Andrew Onishuk <aonis...@hortonworks.com> Committed: Mon Aug 18 20:09:46 2014 +0300 ---------------------------------------------------------------------- .../test/python/stacks/2.0.6/YARN/test_historyserver.py | 8 -------- .../python/stacks/2.0.6/YARN/test_mapreduce2_client.py | 8 -------- .../test/python/stacks/2.0.6/YARN/test_nodemanager.py | 8 -------- .../python/stacks/2.0.6/YARN/test_resourcemanager.py | 8 -------- .../test/python/stacks/2.0.6/YARN/test_yarn_client.py | 12 ------------ .../python/stacks/2.1/YARN/test_apptimelineserver.py | 4 ---- 6 files changed, 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/eefa2fd5/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py index 6f12b60..86e3353 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py +++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py @@ -285,10 +285,6 @@ class TestHistoryServer(RMFTestCase): configurations = self.getConfig()['configurations']['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', owner = 'hdfs', group = 'hadoop', @@ -486,10 +482,6 @@ class TestHistoryServer(RMFTestCase): configurations = self.getConfig()['configurations']['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', owner = 'hdfs', group = 'hadoop', http://git-wip-us.apache.org/repos/asf/ambari/blob/eefa2fd5/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_client.py b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_client.py index e28fa45..4218a59 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_client.py +++ b/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'], 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', owner = 'hdfs', group = 'hadoop', @@ -292,10 +288,6 @@ class TestMapReduce2Client(RMFTestCase): configurations = self.getConfig()['configurations']['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', owner = 'hdfs', group = 'hadoop', http://git-wip-us.apache.org/repos/asf/ambari/blob/eefa2fd5/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 0e621a2..597324a 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 @@ -285,10 +285,6 @@ class TestNodeManager(RMFTestCase): configurations = self.getConfig()['configurations']['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', owner = 'hdfs', group = 'hadoop', @@ -486,10 +482,6 @@ class TestNodeManager(RMFTestCase): configurations = self.getConfig()['configurations']['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', owner = 'hdfs', group = 'hadoop', http://git-wip-us.apache.org/repos/asf/ambari/blob/eefa2fd5/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 66551c1..8410b56 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 @@ -229,10 +229,6 @@ class TestResourceManager(RMFTestCase): configurations = self.getConfig()['configurations']['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', owner = 'hdfs', group = 'hadoop', @@ -375,10 +371,6 @@ class TestResourceManager(RMFTestCase): configurations = self.getConfig()['configurations']['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', owner = 'hdfs', group = 'hadoop', http://git-wip-us.apache.org/repos/asf/ambari/blob/eefa2fd5/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 9944cc3..032f334 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 @@ -145,10 +145,6 @@ class TestYarnClient(RMFTestCase): configurations = self.getConfig()['configurations']['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', owner = 'hdfs', group = 'hadoop', @@ -293,10 +289,6 @@ class TestYarnClient(RMFTestCase): configurations = self.getConfig()['configurations']['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', owner = 'hdfs', group = 'hadoop', @@ -436,10 +428,6 @@ class TestYarnClient(RMFTestCase): configurations = self.getConfig()['configurations']['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', owner = 'hdfs', group = 'hadoop', http://git-wip-us.apache.org/repos/asf/ambari/blob/eefa2fd5/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 4de15c1..7dbbd9a 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 @@ -184,10 +184,6 @@ class TestAppTimelineServer(RMFTestCase): configurations = self.getConfig()['configurations']['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', owner = 'hdfs', group = 'hadoop',
