Repository: ambari Updated Branches: refs/heads/trunk 61828bd41 -> a645599a8
AMBARI-4858. Add configurations to support Hive running on Tez or Mapreduce (missed tests) (ncole) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a645599a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a645599a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a645599a Branch: refs/heads/trunk Commit: a645599a80efb18404298b728a771da60d010512 Parents: 61828bd Author: Nate Cole <[email protected]> Authored: Fri Feb 28 18:27:08 2014 -0500 Committer: Nate Cole <[email protected]> Committed: Fri Feb 28 18:31:42 2014 -0500 ---------------------------------------------------------------------- .../python/stacks/2.0.6/HIVE/test_hive_client.py | 16 +++++++++++++++- .../python/stacks/2.0.6/HIVE/test_hive_metastore.py | 14 ++++++++++++++ .../python/stacks/2.0.6/HIVE/test_hive_server.py | 14 ++++++++++++++ 3 files changed, 43 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/a645599a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_client.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_client.py index b555c0f..9c570d1 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_client.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_client.py @@ -34,6 +34,13 @@ class TestHiveClient(RMFTestCase): group = 'hadoop', recursive = True, ) + self.assertResourceCalled('XmlConfig', 'mapred-site.xml', + owner = 'hive', + group = 'hadoop', + mode = 0644, + conf_dir = '/etc/hive/conf', + configurations = self.getConfig()['configurations']['mapred-site'], + ) self.assertResourceCalled('XmlConfig', 'hive-site.xml', owner = 'hive', group = 'hadoop', @@ -87,6 +94,13 @@ class TestHiveClient(RMFTestCase): group = 'hadoop', recursive = True, ) + self.assertResourceCalled('XmlConfig', 'mapred-site.xml', + owner = 'hive', + group = 'hadoop', + mode = 0644, + conf_dir = '/etc/hive/conf', + configurations = self.getConfig()['configurations']['mapred-site'], + ) self.assertResourceCalled('XmlConfig', 'hive-site.xml', owner = 'hive', group = 'hadoop', @@ -124,4 +138,4 @@ class TestHiveClient(RMFTestCase): owner='hive', content='log4jproperties\nline2' ) - self.assertNoMoreResources() \ No newline at end of file + self.assertNoMoreResources() http://git-wip-us.apache.org/repos/asf/ambari/blob/a645599a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py index b6b5b5a..b9a7c22 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py @@ -150,6 +150,13 @@ class TestHiveMetastore(RMFTestCase): group = 'hadoop', recursive = True, ) + self.assertResourceCalled('XmlConfig', 'mapred-site.xml', + owner = 'hive', + group = 'hadoop', + mode = 0600, + conf_dir = '/etc/hive/conf.server', + configurations = self.getConfig()['configurations']['mapred-site'], + ) self.assertResourceCalled('XmlConfig', 'hive-site.xml', owner = 'hive', group = 'hadoop', @@ -207,6 +214,13 @@ class TestHiveMetastore(RMFTestCase): group = 'hadoop', recursive = True, ) + self.assertResourceCalled('XmlConfig', 'mapred-site.xml', + owner = 'hive', + group = 'hadoop', + mode = 0600, + conf_dir = '/etc/hive/conf.server', + configurations = self.getConfig()['configurations']['mapred-site'], + ) self.assertResourceCalled('XmlConfig', 'hive-site.xml', owner = 'hive', group = 'hadoop', http://git-wip-us.apache.org/repos/asf/ambari/blob/a645599a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py index 10f133d..37e073b 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py @@ -261,6 +261,13 @@ class TestHiveServer(RMFTestCase): group = 'hadoop', recursive = True, ) + self.assertResourceCalled('XmlConfig', 'mapred-site.xml', + owner = 'hive', + group = 'hadoop', + mode = 0600, + conf_dir = '/etc/hive/conf.server', + configurations = self.getConfig()['configurations']['mapred-site'], + ) self.assertResourceCalled('XmlConfig', 'hive-site.xml', owner = 'hive', group = 'hadoop', @@ -347,6 +354,13 @@ class TestHiveServer(RMFTestCase): group = 'hadoop', recursive = True, ) + self.assertResourceCalled('XmlConfig', 'mapred-site.xml', + owner = 'hive', + group = 'hadoop', + mode = 0600, + conf_dir = '/etc/hive/conf.server', + configurations = self.getConfig()['configurations']['mapred-site'], + ) self.assertResourceCalled('XmlConfig', 'hive-site.xml', owner = 'hive', group = 'hadoop',
