Repository: ambari Updated Branches: refs/heads/trunk b98f07f90 -> 4aaf259e1
http://git-wip-us.apache.org/repos/asf/ambari/blob/4aaf259e/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py index 5702b57..d2968f8 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py @@ -416,6 +416,16 @@ class TestDatanode(RMFTestCase): group = 'root', mode = 0644, ) + self.assertResourceCalled('File', conf_dir + '/hdfs_dn_jaas.conf', + content = Template('hdfs_dn_jaas.conf.j2'), + owner = 'hdfs', + group = 'hadoop', + ) + self.assertResourceCalled('File', conf_dir + '/hdfs_nn_jaas.conf', + content = Template('hdfs_nn_jaas.conf.j2'), + owner = 'hdfs', + group = 'hadoop', + ) self.assertResourceCalled('XmlConfig', 'hdfs-site.xml', owner = 'hdfs', group = 'hadoop', http://git-wip-us.apache.org/repos/asf/ambari/blob/4aaf259e/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py index 2202661..ff8f92e 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py @@ -230,6 +230,16 @@ class TestJournalnode(RMFTestCase): group = 'root', mode = 0644, ) + self.assertResourceCalled('File', '/etc/hadoop/conf/hdfs_dn_jaas.conf', + content = Template('hdfs_dn_jaas.conf.j2'), + owner = 'hdfs', + group = 'hadoop', + ) + self.assertResourceCalled('File', '/etc/hadoop/conf/hdfs_nn_jaas.conf', + content = Template('hdfs_nn_jaas.conf.j2'), + owner = 'hdfs', + group = 'hadoop', + ) self.assertResourceCalled('XmlConfig', 'hdfs-site.xml', owner = 'hdfs', group = 'hadoop', @@ -251,7 +261,6 @@ class TestJournalnode(RMFTestCase): ) - @patch('time.sleep') def test_post_upgrade_restart(self, time_mock): # load the NN and JN JMX files so that the urllib2.urlopen mock has data http://git-wip-us.apache.org/repos/asf/ambari/blob/4aaf259e/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py index 01149fb..a7233c7 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py @@ -289,7 +289,7 @@ class TestNamenode(RMFTestCase): stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) - self.assert_configure_secured() + self.assert_configure_secured(False) self.assertNoMoreResources() @@ -302,7 +302,7 @@ class TestNamenode(RMFTestCase): target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0,"")], ) - self.assert_configure_secured() + self.assert_configure_secured(False) self.assertResourceCalled('File', '/etc/hadoop/conf/dfs.exclude', owner = 'hdfs', content = Template('exclude_hosts_list.j2'), @@ -622,7 +622,7 @@ class TestNamenode(RMFTestCase): stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) - self.assert_configure_secured() + self.assert_configure_secured(True) self.assertResourceCalled('File', '/etc/hadoop/conf/dfs.exclude', owner = 'hdfs', content = Template('exclude_hosts_list.j2'), @@ -1153,7 +1153,7 @@ class TestNamenode(RMFTestCase): cd_access='a' ) - def assert_configure_secured(self): + def assert_configure_secured(self, ha_enabled): self.assertResourceCalled('Directory', '/usr/lib/hadoop/lib/native/Linux-i386-32', create_parents = True, ) @@ -1177,6 +1177,22 @@ class TestNamenode(RMFTestCase): group = 'root', mode = 0644, ) + self.assertResourceCalled('File', '/etc/hadoop/conf/hdfs_dn_jaas.conf', + content = Template('hdfs_dn_jaas.conf.j2'), + owner = 'hdfs', + group = 'hadoop', + ) + self.assertResourceCalled('File', '/etc/hadoop/conf/hdfs_nn_jaas.conf', + content = Template('hdfs_nn_jaas.conf.j2'), + owner = 'hdfs', + group = 'hadoop', + ) + if ha_enabled: + self.assertResourceCalled('File', '/etc/hadoop/conf/hdfs_jn_jaas.conf', + content = Template('hdfs_jn_jaas.conf.j2'), + owner = 'hdfs', + group = 'hadoop', + ) self.assertResourceCalled('XmlConfig', 'hdfs-site.xml', owner = 'hdfs', group = 'hadoop', http://git-wip-us.apache.org/repos/asf/ambari/blob/4aaf259e/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_nfsgateway.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_nfsgateway.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_nfsgateway.py index b8fee12..de425cd 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_nfsgateway.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_nfsgateway.py @@ -243,6 +243,16 @@ class TestNFSGateway(RMFTestCase): group = 'root', mode = 0644, ) + self.assertResourceCalled('File', '/etc/hadoop/conf/hdfs_dn_jaas.conf', + content = Template('hdfs_dn_jaas.conf.j2'), + owner = 'hdfs', + group = 'hadoop', + ) + self.assertResourceCalled('File', '/etc/hadoop/conf/hdfs_nn_jaas.conf', + content = Template('hdfs_nn_jaas.conf.j2'), + owner = 'hdfs', + group = 'hadoop', + ) self.assertResourceCalled('XmlConfig', 'hdfs-site.xml', owner = 'hdfs', group = 'hadoop', http://git-wip-us.apache.org/repos/asf/ambari/blob/4aaf259e/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_snamenode.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_snamenode.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_snamenode.py index 9e9366d..b3d7016 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_snamenode.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_snamenode.py @@ -248,6 +248,16 @@ class TestSNamenode(RMFTestCase): group = 'root', mode = 0644, ) + self.assertResourceCalled('File', '/etc/hadoop/conf/hdfs_dn_jaas.conf', + content = Template('hdfs_dn_jaas.conf.j2'), + owner = 'hdfs', + group = 'hadoop', + ) + self.assertResourceCalled('File', '/etc/hadoop/conf/hdfs_nn_jaas.conf', + content = Template('hdfs_nn_jaas.conf.j2'), + owner = 'hdfs', + group = 'hadoop', + ) self.assertResourceCalled('XmlConfig', 'hdfs-site.xml', owner = 'hdfs', group = 'hadoop', @@ -274,4 +284,4 @@ class TestSNamenode(RMFTestCase): mode = 0755, create_parents = True, cd_access='a' - ) \ No newline at end of file + ) http://git-wip-us.apache.org/repos/asf/ambari/blob/4aaf259e/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_zkfc.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_zkfc.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_zkfc.py index 127a045..0fe200c 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_zkfc.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_zkfc.py @@ -154,6 +154,21 @@ class TestZkfc(RMFTestCase): group = 'root', mode = 0644, ) + self.assertResourceCalled('File', '/etc/hadoop/conf/hdfs_dn_jaas.conf', + content = Template('hdfs_dn_jaas.conf.j2'), + owner = 'hdfs', + group = 'hadoop', + ) + self.assertResourceCalled('File', '/etc/hadoop/conf/hdfs_nn_jaas.conf', + content = Template('hdfs_nn_jaas.conf.j2'), + owner = 'hdfs', + group = 'hadoop', + ) + self.assertResourceCalled('File', '/etc/hadoop/conf/hdfs_jn_jaas.conf', + content = Template('hdfs_jn_jaas.conf.j2'), + owner = 'hdfs', + group = 'hadoop', + ) self.assertResourceCalled('XmlConfig', 'hdfs-site.xml', owner = 'hdfs', group = 'hadoop', @@ -381,4 +396,4 @@ class TestZkfc(RMFTestCase): environment = {'HADOOP_LIBEXEC_DIR': '/usr/lib/hadoop/libexec'}, not_if = "ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E test -f /var/run/hadoop/hdfs/hadoop-hdfs-zkfc.pid && ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E pgrep -F /var/run/hadoop/hdfs/hadoop-hdfs-zkfc.pid", ) - self.assertNoMoreResources() \ No newline at end of file + self.assertNoMoreResources() http://git-wip-us.apache.org/repos/asf/ambari/blob/4aaf259e/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 545f0e6..53d16fd 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 @@ -712,6 +712,16 @@ class TestHistoryServer(RMFTestCase): owner = 'yarn', group = 'hadoop', ) + self.assertResourceCalled('File', '/etc/hadoop/conf/yarn_nm_jaas.conf', + content = Template('yarn_nm_jaas.conf.j2'), + owner = 'yarn', + group = 'hadoop', + ) + self.assertResourceCalled('File', '/etc/hadoop/conf/mapred_jaas.conf', + content = Template('mapred_jaas.conf.j2'), + owner = 'mapred', + group = 'hadoop', + ) self.assertResourceCalled('XmlConfig', 'mapred-site.xml', owner = 'mapred', group = 'hadoop', http://git-wip-us.apache.org/repos/asf/ambari/blob/4aaf259e/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 b05d9f2..7e06969 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 @@ -346,6 +346,16 @@ class TestMapReduce2Client(RMFTestCase): owner = 'yarn', group = 'hadoop', ) + self.assertResourceCalled('File', '/etc/hadoop/conf/yarn_nm_jaas.conf', + content = Template('yarn_nm_jaas.conf.j2'), + owner = 'yarn', + group = 'hadoop', + ) + self.assertResourceCalled('File', '/etc/hadoop/conf/mapred_jaas.conf', + content = Template('mapred_jaas.conf.j2'), + owner = 'mapred', + group = 'hadoop', + ) self.assertResourceCalled('XmlConfig', 'mapred-site.xml', owner = 'mapred', group = 'hadoop', http://git-wip-us.apache.org/repos/asf/ambari/blob/4aaf259e/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 6fc5bae..dfbdd23 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 @@ -530,6 +530,16 @@ class TestNodeManager(RMFTestCase): owner = 'yarn', group = 'hadoop', ) + self.assertResourceCalled('File', '/etc/hadoop/conf/yarn_nm_jaas.conf', + content = Template('yarn_nm_jaas.conf.j2'), + owner = 'yarn', + group = 'hadoop', + ) + self.assertResourceCalled('File', '/etc/hadoop/conf/mapred_jaas.conf', + content = Template('mapred_jaas.conf.j2'), + owner = 'mapred', + group = 'hadoop', + ) self.assertResourceCalled('XmlConfig', 'mapred-site.xml', owner = 'mapred', group = 'hadoop', http://git-wip-us.apache.org/repos/asf/ambari/blob/4aaf259e/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 ed5ee2c..5ccd6a4 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 @@ -498,6 +498,16 @@ class TestResourceManager(RMFTestCase): owner = 'yarn', group = 'hadoop', ) + self.assertResourceCalled('File', '/etc/hadoop/conf/yarn_nm_jaas.conf', + content = Template('yarn_nm_jaas.conf.j2'), + owner = 'yarn', + group = 'hadoop', + ) + self.assertResourceCalled('File', '/etc/hadoop/conf/mapred_jaas.conf', + content = Template('mapred_jaas.conf.j2'), + owner = 'mapred', + group = 'hadoop', + ) self.assertResourceCalled('XmlConfig', 'mapred-site.xml', owner = 'mapred', group = 'hadoop', http://git-wip-us.apache.org/repos/asf/ambari/blob/4aaf259e/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 8873fbf..f71c93a 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 @@ -346,6 +346,16 @@ class TestYarnClient(RMFTestCase): owner = 'yarn', group = 'hadoop', ) + self.assertResourceCalled('File', '/etc/hadoop/conf/yarn_nm_jaas.conf', + content = Template('yarn_nm_jaas.conf.j2'), + owner = 'yarn', + group = 'hadoop', + ) + self.assertResourceCalled('File', '/etc/hadoop/conf/mapred_jaas.conf', + content = Template('mapred_jaas.conf.j2'), + owner = 'mapred', + group = 'hadoop', + ) self.assertResourceCalled('XmlConfig', 'mapred-site.xml', owner = 'mapred', group = 'hadoop',
