AMBARI-4492. ambari-server unit test failures WEBHCAT 1.3.3 unit tests

(aonishuk)

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()
     
 

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,
+    )

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,
     )

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,
     )

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']
     )
 

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']
     )
 

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,

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',

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'),

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'),

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()

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()
     
 

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,
     )

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,
     )

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'),

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',
     )
-

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()