You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2014/01/31 21:50:41 UTC
git commit: AMBARI-4492. ambari-server unit test failures WEBHCAT
1.3.3 unit tests (aonishuk)
Updated Branches:
refs/heads/trunk 43f14b349 -> 969800287
AMBARI-4492. ambari-server unit test failures WEBHCAT 1.3.3 unit tests
(aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/96980028
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/96980028
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/96980028
Branch: refs/heads/trunk
Commit: 96980028711f7df88c387bd88a8cf7a4d07f8b89
Parents: 43f14b3
Author: Andrew Onischuk <ao...@hortonworks.com>
Authored: Fri Jan 31 12:42:28 2014 -0800
Committer: Andrew Onischuk <ao...@hortonworks.com>
Committed: Fri Jan 31 12:42:28 2014 -0800
----------------------------------------------------------------------
.../stacks/1.3.2/HBASE/test_hbase_client.py | 10 ++++++++++
.../stacks/1.3.2/HBASE/test_hbase_master.py | 10 ++++++++++
.../1.3.2/HBASE/test_hbase_regionserver.py | 10 ++++++++++
.../python/stacks/1.3.2/HIVE/test_hcat_client.py | 4 ++--
.../stacks/1.3.2/HIVE/test_hive_metastore.py | 4 ++--
.../python/stacks/1.3.2/HIVE/test_hive_server.py | 4 ++--
.../stacks/1.3.2/HIVE/test_mysql_server.py | 4 ++--
.../stacks/1.3.2/WEBHCAT/test_webhcat_server.py | 16 ++++++++--------
.../1.3.2/ZOOKEEPER/test_zookeeper_client.py | 10 ++++++++++
.../1.3.2/ZOOKEEPER/test_zookeeper_server.py | 10 ++++++++++
.../hooks/before-START/test_before_start.py | 18 ++++++++++++++++++
.../stacks/2.0.6/HBASE/test_hbase_client.py | 10 ++++++++++
.../stacks/2.0.6/HBASE/test_hbase_master.py | 10 ++++++++++
.../2.0.6/HBASE/test_hbase_regionserver.py | 11 ++++++++++-
.../2.0.6/ZOOKEEPER/test_zookeeper_client.py | 10 ++++++++++
.../2.0.6/ZOOKEEPER/test_zookeeper_server.py | 11 ++++++++++-
.../hooks/before-START/test_before_start.py | 19 +++++++++++++++++++
17 files changed, 153 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/96980028/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_client.py b/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_client.py
index 327e88f..ac042e2 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_client.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_client.py
@@ -66,6 +66,11 @@ class TestHBaseClient(RMFTestCase):
owner = 'hbase',
template_tag = None,
)
+ self.assertResourceCalled('File', '/etc/hbase/conf/log4j.properties',
+ owner = 'hbase',
+ group = 'hadoop',
+ mode = 420,
+ )
self.assertNoMoreResources()
def test_configure_default(self):
@@ -108,6 +113,11 @@ class TestHBaseClient(RMFTestCase):
owner = 'hbase',
template_tag = None,
)
+ self.assertResourceCalled('File', '/etc/hbase/conf/log4j.properties',
+ owner = 'hbase',
+ group = 'hadoop',
+ mode = 420,
+ )
self.assertNoMoreResources()
http://git-wip-us.apache.org/repos/asf/ambari/blob/96980028/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_master.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_master.py b/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_master.py
index 69db529..a379b2c 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_master.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_master.py
@@ -171,6 +171,11 @@ class TestHBaseMaster(RMFTestCase):
owner = 'hbase',
recursive = True,
)
+ self.assertResourceCalled('File', '/etc/hbase/conf/log4j.properties',
+ owner = 'hbase',
+ group = 'hadoop',
+ mode = 420,
+ )
def assert_configure_secured(self):
self.assertResourceCalled('Directory', '/etc/hbase/conf',
@@ -222,3 +227,8 @@ class TestHBaseMaster(RMFTestCase):
owner = 'hbase',
recursive = True,
)
+ self.assertResourceCalled('File', '/etc/hbase/conf/log4j.properties',
+ owner = 'hbase',
+ group = 'hadoop',
+ mode = 420,
+ )
http://git-wip-us.apache.org/repos/asf/ambari/blob/96980028/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_regionserver.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_regionserver.py b/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_regionserver.py
index a18c1fd..4113340 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_regionserver.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_regionserver.py
@@ -142,6 +142,11 @@ class TestHbaseRegionServer(RMFTestCase):
owner = 'hbase',
recursive = True,
)
+ self.assertResourceCalled('File', '/etc/hbase/conf/log4j.properties',
+ owner = 'hbase',
+ group = 'hadoop',
+ mode = 420,
+ )
def assert_configure_secured(self):
@@ -193,4 +198,9 @@ class TestHbaseRegionServer(RMFTestCase):
self.assertResourceCalled('Directory', '/var/log/hbase',
owner = 'hbase',
recursive = True,
+ )
+ self.assertResourceCalled('File', '/etc/hbase/conf/log4j.properties',
+ owner = 'hbase',
+ group = 'hadoop',
+ mode = 420,
)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/96980028/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hcat_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hcat_client.py b/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hcat_client.py
index 6088548..d257da9 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hcat_client.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hcat_client.py
@@ -33,7 +33,7 @@ class TestHcatClient(RMFTestCase):
owner = 'hcat',
group = 'hadoop',
)
- self.assertResourceCalled('Directory', '/var/run/webhcat',
+ self.assertResourceCalled('Directory', '/etc/run/webhcat',
owner = 'hcat',
recursive = True,
)
@@ -56,7 +56,7 @@ class TestHcatClient(RMFTestCase):
owner = 'hcat',
group = 'hadoop',
)
- self.assertResourceCalled('Directory', '/var/run/webhcat',
+ self.assertResourceCalled('Directory', '/etc/run/webhcat',
owner = 'hcat',
recursive = True,
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/96980028/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_metastore.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_metastore.py b/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_metastore.py
index 59084ab..0d30b8c 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_metastore.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_metastore.py
@@ -44,7 +44,7 @@ class TestHiveMetastore(RMFTestCase):
user = 'hive'
)
- self.assertResourceCalled('Execute', '/usr/jdk64/jdk1.7.0_45/bin/java -cp /usr/lib/ambari-agent/DBConnectionVerification.jar:/usr/share/java/mysql-connector-java.jar org.apache.ambari.server.DBConnectionVerification jdbc:mysql://c6402.ambari.apache.org/hive?createDatabaseIfNotExist=true hive asd com.mysql.jdbc.Driver',
+ self.assertResourceCalled('Execute', '/usr/jdk64/jdk1.7.0_45/bin/java -cp /usr/lib/ambari-agent/DBConnectionVerification.jar:/usr/share/java/mysql-connector-java.jar org.apache.ambari.server.DBConnectionVerification jdbc:mysql://c6402.ambari.apache.org/hive?createDatabaseIfNotExist=true hive q com.mysql.jdbc.Driver',
path=['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin']
)
@@ -82,7 +82,7 @@ class TestHiveMetastore(RMFTestCase):
user = 'hive'
)
- self.assertResourceCalled('Execute', '/usr/jdk64/jdk1.7.0_45/bin/java -cp /usr/lib/ambari-agent/DBConnectionVerification.jar:/usr/share/java/mysql-connector-java.jar org.apache.ambari.server.DBConnectionVerification jdbc:mysql://c6402.ambari.apache.org/hive?createDatabaseIfNotExist=true hive asd com.mysql.jdbc.Driver',
+ self.assertResourceCalled('Execute', '/usr/jdk64/jdk1.7.0_45/bin/java -cp /usr/lib/ambari-agent/DBConnectionVerification.jar:/usr/share/java/mysql-connector-java.jar org.apache.ambari.server.DBConnectionVerification jdbc:mysql://c6402.ambari.apache.org/hive?createDatabaseIfNotExist=true hive q com.mysql.jdbc.Driver',
path=['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin']
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/96980028/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_server.py b/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_server.py
index b5d9a40..60d4722 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_server.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_server.py
@@ -44,7 +44,7 @@ class TestHiveServer(RMFTestCase):
user = 'hive'
)
- self.assertResourceCalled('Execute', '/usr/jdk64/jdk1.7.0_45/bin/java -cp /usr/lib/ambari-agent/DBConnectionVerification.jar:/usr/share/java/mysql-connector-java.jar org.apache.ambari.server.DBConnectionVerification jdbc:mysql://c6402.ambari.apache.org/hive?createDatabaseIfNotExist=true hive asd com.mysql.jdbc.Driver',
+ self.assertResourceCalled('Execute', '/usr/jdk64/jdk1.7.0_45/bin/java -cp /usr/lib/ambari-agent/DBConnectionVerification.jar:/usr/share/java/mysql-connector-java.jar org.apache.ambari.server.DBConnectionVerification jdbc:mysql://c6402.ambari.apache.org/hive?createDatabaseIfNotExist=true hive q com.mysql.jdbc.Driver',
path=['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin']
)
@@ -83,7 +83,7 @@ class TestHiveServer(RMFTestCase):
user = 'hive'
)
- self.assertResourceCalled('Execute', '/usr/jdk64/jdk1.7.0_45/bin/java -cp /usr/lib/ambari-agent/DBConnectionVerification.jar:/usr/share/java/mysql-connector-java.jar org.apache.ambari.server.DBConnectionVerification jdbc:mysql://c6402.ambari.apache.org/hive?createDatabaseIfNotExist=true hive asd com.mysql.jdbc.Driver',
+ self.assertResourceCalled('Execute', '/usr/jdk64/jdk1.7.0_45/bin/java -cp /usr/lib/ambari-agent/DBConnectionVerification.jar:/usr/share/java/mysql-connector-java.jar org.apache.ambari.server.DBConnectionVerification jdbc:mysql://c6402.ambari.apache.org/hive?createDatabaseIfNotExist=true hive q com.mysql.jdbc.Driver',
path=['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin']
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/96980028/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_mysql_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_mysql_server.py b/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_mysql_server.py
index d424a12..6f95f1c 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_mysql_server.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_mysql_server.py
@@ -106,7 +106,7 @@ class TestMySqlServer(RMFTestCase):
content = StaticFile('addMysqlUser.sh'),
mode = 493,
)
- self.assertResourceCalled('Execute', ('bash', '-x', '/tmp/addMysqlUser.sh', 'mysql', u'hive', 'asd', u'c6402.ambari.apache.org'),
+ self.assertResourceCalled('Execute', ('bash', '-x', '/tmp/addMysqlUser.sh', 'mysql', 'hive', 'q', 'c6402.ambari.apache.org'),
logoutput = True,
path = ['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'],
tries = 3,
@@ -128,7 +128,7 @@ class TestMySqlServer(RMFTestCase):
content = StaticFile('addMysqlUser.sh'),
mode = 493,
)
- self.assertResourceCalled('Execute', ('bash', '-x', '/tmp/addMysqlUser.sh', 'mysql', u'hive', 'asd', u'c6402.ambari.apache.org'),
+ self.assertResourceCalled('Execute', ('bash', '-x', '/tmp/addMysqlUser.sh', 'mysql', 'hive', 'q', 'c6402.ambari.apache.org'),
logoutput = True,
path = ['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'],
tries = 3,
http://git-wip-us.apache.org/repos/asf/ambari/blob/96980028/ambari-server/src/test/python/stacks/1.3.2/WEBHCAT/test_webhcat_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/WEBHCAT/test_webhcat_server.py b/ambari-server/src/test/python/stacks/1.3.2/WEBHCAT/test_webhcat_server.py
index 7690954..7b032c9 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/WEBHCAT/test_webhcat_server.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/WEBHCAT/test_webhcat_server.py
@@ -40,7 +40,7 @@ class TestWebHCatServer(RMFTestCase):
self.assert_configure_default()
self.assertResourceCalled('Execute', 'env HADOOP_HOME=/usr /usr/lib/hcatalog/sbin/webhcat_server.sh start',
- not_if = 'ls /var/run/webhcat/webhcat.pid >/dev/null 2>&1 && ps `cat /var/run/webhcat/webhcat.pid` >/dev/null 2>&1',
+ not_if = 'ls /etc/run/webhcat/webhcat.pid >/dev/null 2>&1 && ps `cat /etc/run/webhcat/webhcat.pid` >/dev/null 2>&1',
user = 'hcat'
)
self.assertNoMoreResources()
@@ -55,7 +55,7 @@ class TestWebHCatServer(RMFTestCase):
self.assertResourceCalled('Execute', 'env HADOOP_HOME=/usr /usr/lib/hcatalog/sbin/webhcat_server.sh stop',
user = 'hcat',
)
- self.assertResourceCalled('Execute', 'rm -f /var/run/webhcat/webhcat.pid')
+ self.assertResourceCalled('Execute', 'rm -f /etc/run/webhcat/webhcat.pid')
self.assertNoMoreResources()
def test_configure_secured(self):
@@ -77,7 +77,7 @@ class TestWebHCatServer(RMFTestCase):
self.assert_configure_secured()
self.assertResourceCalled('Execute', 'env HADOOP_HOME=/usr /usr/lib/hcatalog/sbin/webhcat_server.sh start',
- not_if = 'ls /var/run/webhcat/webhcat.pid >/dev/null 2>&1 && ps `cat /var/run/webhcat/webhcat.pid` >/dev/null 2>&1',
+ not_if = 'ls /etc/run/webhcat/webhcat.pid >/dev/null 2>&1 && ps `cat /etc/run/webhcat/webhcat.pid` >/dev/null 2>&1',
user = 'hcat'
)
self.assertNoMoreResources()
@@ -92,11 +92,11 @@ class TestWebHCatServer(RMFTestCase):
self.assertResourceCalled('Execute', 'env HADOOP_HOME=/usr /usr/lib/hcatalog/sbin/webhcat_server.sh stop',
user = 'hcat',
)
- self.assertResourceCalled('Execute', 'rm -f /var/run/webhcat/webhcat.pid')
+ self.assertResourceCalled('Execute', 'rm -f /etc/run/webhcat/webhcat.pid')
self.assertNoMoreResources()
def assert_configure_default(self):
- self.assertResourceCalled('Directory', '/var/run/webhcat',
+ self.assertResourceCalled('Directory', '/etc/run/webhcat',
owner = 'hcat',
group = 'hadoop',
recursive = True,
@@ -123,7 +123,7 @@ class TestWebHCatServer(RMFTestCase):
owner = 'hcat',
group = 'hadoop',
)
- self.assertResourceCalled('ExecuteHadoop', 'fs -copyFromLocal /usr/lib/hadoop-mapreduce/hadoop-streaming*.jar /apps/webhcat/hadoop-streaming.jar',
+ self.assertResourceCalled('ExecuteHadoop', 'fs -copyFromLocal /usr/lib/hadoop/contrib/streaming/hadoop-streaming*.jar /apps/webhcat/hadoop-streaming.jar',
not_if = ' hadoop fs -ls /apps/webhcat/hadoop-streaming.jar >/dev/null 2>&1',
user = 'hcat',
conf_dir = '/etc/hadoop/conf',
@@ -140,7 +140,7 @@ class TestWebHCatServer(RMFTestCase):
)
def assert_configure_secured(self):
- self.assertResourceCalled('Directory', '/var/run/webhcat',
+ self.assertResourceCalled('Directory', '/etc/run/webhcat',
owner = 'hcat',
group = 'hadoop',
recursive = True,
@@ -171,7 +171,7 @@ class TestWebHCatServer(RMFTestCase):
path = ['/bin'],
user = 'hcat',
)
- self.assertResourceCalled('ExecuteHadoop', 'fs -copyFromLocal /usr/lib/hadoop-mapreduce/hadoop-streaming*.jar /apps/webhcat/hadoop-streaming.jar',
+ self.assertResourceCalled('ExecuteHadoop', 'fs -copyFromLocal /usr/lib/hadoop/contrib/streaming/hadoop-streaming*.jar /apps/webhcat/hadoop-streaming.jar',
not_if = '/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab ambari-qa; hadoop fs -ls /apps/webhcat/hadoop-streaming.jar >/dev/null 2>&1',
user = 'hcat',
conf_dir = '/etc/hadoop/conf',
http://git-wip-us.apache.org/repos/asf/ambari/blob/96980028/ambari-server/src/test/python/stacks/1.3.2/ZOOKEEPER/test_zookeeper_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/ZOOKEEPER/test_zookeeper_client.py b/ambari-server/src/test/python/stacks/1.3.2/ZOOKEEPER/test_zookeeper_client.py
index f36b83a..84b370e 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/ZOOKEEPER/test_zookeeper_client.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/ZOOKEEPER/test_zookeeper_client.py
@@ -63,6 +63,11 @@ class TestZookeeperClient(RMFTestCase):
group = 'hadoop',
recursive = True,
)
+ self.assertResourceCalled('File', '/etc/zookeeper/conf/log4j.properties',
+ owner = 'zookeeper',
+ group = 'hadoop',
+ mode = 420,
+ )
self.assertResourceCalled('File', '/etc/zookeeper/conf/zoo_sample.cfg',
owner = 'zookeeper',
group = 'hadoop',
@@ -112,6 +117,11 @@ class TestZookeeperClient(RMFTestCase):
group = 'hadoop',
recursive = True,
)
+ self.assertResourceCalled('File', '/etc/zookeeper/conf/log4j.properties',
+ owner = 'zookeeper',
+ group = 'hadoop',
+ mode = 420,
+ )
self.assertResourceCalled('File', '/etc/zookeeper/conf/zookeeper_client_jaas.conf',
owner = 'zookeeper',
content = Template('zookeeper_client_jaas.conf.j2'),
http://git-wip-us.apache.org/repos/asf/ambari/blob/96980028/ambari-server/src/test/python/stacks/1.3.2/ZOOKEEPER/test_zookeeper_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/ZOOKEEPER/test_zookeeper_server.py b/ambari-server/src/test/python/stacks/1.3.2/ZOOKEEPER/test_zookeeper_server.py
index 876fd3e..5faab9e 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/ZOOKEEPER/test_zookeeper_server.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/ZOOKEEPER/test_zookeeper_server.py
@@ -138,6 +138,11 @@ class TestZookeeperServer(RMFTestCase):
content = '1',
mode = 420,
)
+ self.assertResourceCalled('File', '/etc/zookeeper/conf/log4j.properties',
+ owner = 'zookeeper',
+ group = 'hadoop',
+ mode = 420,
+ )
self.assertResourceCalled('File', '/etc/zookeeper/conf/zoo_sample.cfg',
owner = 'zookeeper',
group = 'hadoop',
@@ -184,6 +189,11 @@ class TestZookeeperServer(RMFTestCase):
content = '1',
mode = 420,
)
+ self.assertResourceCalled('File', '/etc/zookeeper/conf/log4j.properties',
+ owner = 'zookeeper',
+ group = 'hadoop',
+ mode = 420,
+ )
self.assertResourceCalled('File', '/etc/zookeeper/conf/zookeeper_jaas.conf',
owner = 'zookeeper',
content = Template('zookeeper_jaas.conf.j2'),
http://git-wip-us.apache.org/repos/asf/ambari/blob/96980028/ambari-server/src/test/python/stacks/1.3.2/hooks/before-START/test_before_start.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/hooks/before-START/test_before_start.py b/ambari-server/src/test/python/stacks/1.3.2/hooks/before-START/test_before_start.py
index 18a83b8..72a68d4 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/hooks/before-START/test_before_start.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/hooks/before-START/test_before_start.py
@@ -94,6 +94,11 @@ class TestHookBeforeStart(RMFTestCase):
content = Template('health_check.j2'),
owner = 'hdfs',
)
+ self.assertResourceCalled('File', '/etc/hadoop/conf/log4j.properties',
+ owner = 'hdfs',
+ group = 'hadoop',
+ mode = 420,
+ )
self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?ambari.jobhistory.driver=.*~ambari.jobhistory.driver=org.postgresql.Driver~' /etc/hadoop/conf/log4j.properties",
)
self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?log4j.appender.JHA=.*~log4j.appender.JHA=org.apache.ambari.log4j.hadoop.mapreduce.jobhistory.JobHistoryAppender~' /etc/hadoop/conf/log4j.properties",
@@ -147,4 +152,17 @@ class TestHookBeforeStart(RMFTestCase):
self.assertResourceCalled('Link', '/usr/lib/hadoop/lib/hadoop-tools.jar',
to = '/usr/lib/hadoop/hadoop-tools.jar',
)
+
+ self.assertResourceCalled('File', '/etc/hadoop/conf/configuration.xsl',
+ owner = 'hdfs',
+ group = 'hadoop',
+ )
+ self.assertResourceCalled('File', '/etc/hadoop/conf/ssl-client.xml.example',
+ owner = 'mapred',
+ group = 'hadoop',
+ )
+ self.assertResourceCalled('File', '/etc/hadoop/conf/ssl-server.xml.example',
+ owner = 'mapred',
+ group = 'hadoop',
+ )
self.assertNoMoreResources()
http://git-wip-us.apache.org/repos/asf/ambari/blob/96980028/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py
index 2d8bd77..fde0428 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py
@@ -66,6 +66,11 @@ class TestHBaseClient(RMFTestCase):
owner = 'hbase',
template_tag = None,
)
+ self.assertResourceCalled('File', '/etc/hbase/conf/log4j.properties',
+ owner = 'hbase',
+ group = 'hadoop',
+ mode = 420,
+ )
self.assertNoMoreResources()
def test_configure_default(self):
@@ -108,6 +113,11 @@ class TestHBaseClient(RMFTestCase):
owner = 'hbase',
template_tag = None,
)
+ self.assertResourceCalled('File', '/etc/hbase/conf/log4j.properties',
+ owner = 'hbase',
+ group = 'hadoop',
+ mode = 420,
+ )
self.assertNoMoreResources()
http://git-wip-us.apache.org/repos/asf/ambari/blob/96980028/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
index 9032f38..83ab4e4 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
@@ -171,6 +171,11 @@ class TestHBaseMaster(RMFTestCase):
owner = 'hbase',
recursive = True,
)
+ self.assertResourceCalled('File', '/etc/hbase/conf/log4j.properties',
+ owner = 'hbase',
+ group = 'hadoop',
+ mode = 420,
+ )
def assert_configure_secured(self):
self.assertResourceCalled('Directory', '/etc/hbase/conf',
@@ -221,4 +226,9 @@ class TestHBaseMaster(RMFTestCase):
self.assertResourceCalled('Directory', '/var/log/hbase',
owner = 'hbase',
recursive = True,
+ )
+ self.assertResourceCalled('File', '/etc/hbase/conf/log4j.properties',
+ owner = 'hbase',
+ group = 'hadoop',
+ mode = 420,
)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/96980028/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py
index 9fbcd0e..f1f706e 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py
@@ -141,7 +141,11 @@ class TestHbaseRegionServer(RMFTestCase):
owner = 'hbase',
recursive = True,
)
-
+ self.assertResourceCalled('File', '/etc/hbase/conf/log4j.properties',
+ owner = 'hbase',
+ group = 'hadoop',
+ mode = 420,
+ )
def assert_configure_secured(self):
self.assertResourceCalled('Directory', '/etc/hbase/conf',
@@ -192,4 +196,9 @@ class TestHbaseRegionServer(RMFTestCase):
self.assertResourceCalled('Directory', '/var/log/hbase',
owner = 'hbase',
recursive = True,
+ )
+ self.assertResourceCalled('File', '/etc/hbase/conf/log4j.properties',
+ owner = 'hbase',
+ group = 'hadoop',
+ mode = 420,
)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/96980028/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_client.py b/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_client.py
index 44f7e73..415e4f2 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_client.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_client.py
@@ -64,6 +64,11 @@ class TestZookeeperClient(RMFTestCase):
group = 'hadoop',
recursive = True,
)
+ self.assertResourceCalled('File', '/etc/zookeeper/conf/log4j.properties',
+ owner = 'zookeeper',
+ group = 'hadoop',
+ mode = 420,
+ )
self.assertResourceCalled('File', '/etc/zookeeper/conf/zoo_sample.cfg',
owner = 'zookeeper',
group = 'hadoop',
@@ -113,6 +118,11 @@ class TestZookeeperClient(RMFTestCase):
group = 'hadoop',
recursive = True,
)
+ self.assertResourceCalled('File', '/etc/zookeeper/conf/log4j.properties',
+ owner = 'zookeeper',
+ group = 'hadoop',
+ mode = 420,
+ )
self.assertResourceCalled('File', '/etc/zookeeper/conf/zookeeper_client_jaas.conf',
owner = 'zookeeper',
content = Template('zookeeper_client_jaas.conf.j2'),
http://git-wip-us.apache.org/repos/asf/ambari/blob/96980028/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py b/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py
index 2a97038..95460e5 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py
@@ -135,6 +135,11 @@ class TestZookeeperServer(RMFTestCase):
content = '1',
mode = 420,
)
+ self.assertResourceCalled('File', '/etc/zookeeper/conf/log4j.properties',
+ owner = 'zookeeper',
+ group = 'hadoop',
+ mode = 420,
+ )
self.assertResourceCalled('File', '/etc/zookeeper/conf/zoo_sample.cfg',
owner = 'zookeeper',
group = 'hadoop',
@@ -180,6 +185,11 @@ class TestZookeeperServer(RMFTestCase):
content = '1',
mode = 420,
)
+ self.assertResourceCalled('File', '/etc/zookeeper/conf/log4j.properties',
+ owner = 'zookeeper',
+ group = 'hadoop',
+ mode = 420,
+ )
self.assertResourceCalled('File', '/etc/zookeeper/conf/zookeeper_jaas.conf',
owner = 'zookeeper',
content = Template('zookeeper_jaas.conf.j2'),
@@ -194,4 +204,3 @@ class TestZookeeperServer(RMFTestCase):
owner = 'zookeeper',
group = 'hadoop',
)
-
http://git-wip-us.apache.org/repos/asf/ambari/blob/96980028/ambari-server/src/test/python/stacks/2.0.6/hooks/before-START/test_before_start.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-START/test_before_start.py b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-START/test_before_start.py
index 65b2447..a6ccb69 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-START/test_before_start.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-START/test_before_start.py
@@ -98,6 +98,13 @@ class TestHookBeforeStart(RMFTestCase):
content = Template('health_check-v2.j2'),
owner = 'hdfs',
)
+
+ self.assertResourceCalled('File', '/etc/hadoop/conf/log4j.properties',
+ owner = 'hdfs',
+ group = 'hadoop',
+ mode = 420,
+ )
+
self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?ambari.jobhistory.driver=.*~###ambari.jobhistory.driver=o~' /etc/hadoop/conf/log4j.properties",
)
self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?log4j.appender.JHA=.*~###log4j.appender.JHA=org.apache.ambari.log4j.hadoop.mapreduce.jobhistory.JobHistoryAppender~' /etc/hadoop/conf/log4j.properties",
@@ -154,4 +161,16 @@ class TestHookBeforeStart(RMFTestCase):
conf_dir = '/etc/hadoop/conf',
configurations = self.getConfig()['configurations']['hdfs-site'],
)
+ self.assertResourceCalled('File', '/etc/hadoop/conf/configuration.xsl',
+ owner = 'hdfs',
+ group = 'hadoop',
+ )
+ self.assertResourceCalled('File', '/etc/hadoop/conf/ssl-client.xml.example',
+ owner = 'mapred',
+ group = 'hadoop',
+ )
+ self.assertResourceCalled('File', '/etc/hadoop/conf/ssl-server.xml.example',
+ owner = 'mapred',
+ group = 'hadoop',
+ )
self.assertNoMoreResources()