AMBARI-4700. Oozie tests fails (Ivan Kozlov via aonishuk)

ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_oozie_client.py

@@ -42,6 +42,13 @@ class TestOozieClient(RMFTestCase):
     self.assertResourceCalled('TemplateConfig', '/etc/oozie/conf/oozie-env.sh',
       owner = 'oozie',
     )
+    self.assertResourceCalled('PropertiesFile', 'oozie-log4j.properties',
+      owner = 'oozie',
+      group = 'hadoop',
+      mode = 0664,
+      dir = '/etc/oozie/conf',
+      properties = self.getConfig()['configurations']['oozie-log4j'],
+    )
     self.assertResourceCalled('File', '/etc/oozie/conf/adminusers.txt',
       owner = 'oozie',
       group = 'hadoop',
@@ -85,6 +92,13 @@ class TestOozieClient(RMFTestCase):
     self.assertResourceCalled('TemplateConfig', '/etc/oozie/conf/oozie-env.sh',
       owner = 'oozie',
     )
+    self.assertResourceCalled('PropertiesFile', 'oozie-log4j.properties',
+      owner = 'oozie',
+      group = 'hadoop',
+      mode = 0664,
+      dir = '/etc/oozie/conf',
+      properties = self.getConfig()['configurations']['oozie-log4j'],
+    )
     self.assertResourceCalled('File', '/etc/oozie/conf/adminusers.txt',
       owner = 'oozie',
       group = 'hadoop',

ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_oozie_server.py

@@ -52,6 +52,13 @@ class TestOozieServer(RMFTestCase):
     self.assertResourceCalled('TemplateConfig', '/etc/oozie/conf/oozie-env.sh',
       owner = 'oozie',
     )
+    self.assertResourceCalled('PropertiesFile', 'oozie-log4j.properties',
+      owner = 'oozie',
+      group = 'hadoop',
+      mode = 0664,
+      dir = '/etc/oozie/conf',
+      properties = self.getConfig()['configurations']['oozie-log4j'],
+    )
     self.assertResourceCalled('File', '/etc/oozie/conf/adminusers.txt',
       owner = 'oozie',
       group = 'hadoop',
@@ -183,6 +190,13 @@ class TestOozieServer(RMFTestCase):
     self.assertResourceCalled('TemplateConfig', '/etc/oozie/conf/oozie-env.sh',
       owner = 'oozie',
     )
+    self.assertResourceCalled('PropertiesFile', 'oozie-log4j.properties',
+      owner = 'oozie',
+      group = 'hadoop',
+      mode = 0664,
+      dir = '/etc/oozie/conf',
+      properties = self.getConfig()['configurations']['oozie-log4j'],
+    )
     self.assertResourceCalled('File', '/etc/oozie/conf/adminusers.txt',
       owner = 'oozie',
       group = 'hadoop',
@@ -308,6 +322,13 @@ class TestOozieServer(RMFTestCase):
     self.assertResourceCalled('TemplateConfig', '/etc/oozie/conf/oozie-env.sh',
                               owner = 'oozie',
                               )
+    self.assertResourceCalled('PropertiesFile', 'oozie-log4j.properties',
+                              owner = 'oozie',
+                              group = 'hadoop',
+                              mode = 0664,
+                              dir = '/etc/oozie/conf',
+                              properties = self.getConfig()['configurations']['oozie-log4j'],
+                              )
     self.assertResourceCalled('File', '/etc/oozie/conf/adminusers.txt',
                               owner = 'oozie',
                               group = 'hadoop',
@@ -397,6 +418,13 @@ class TestOozieServer(RMFTestCase):
     self.assertResourceCalled('TemplateConfig', '/etc/oozie/conf/oozie-env.sh',
                               owner = 'oozie',
                               )
+    self.assertResourceCalled('PropertiesFile', 'oozie-log4j.properties',
+                              owner = 'oozie',
+                              group = 'hadoop',
+                              mode = 0664,
+                              dir = '/etc/oozie/conf',
+                              properties = self.getConfig()['configurations']['oozie-log4j'],
+                              )
     self.assertResourceCalled('File', '/etc/oozie/conf/adminusers.txt',
                               owner = 'oozie',
                               group = 'hadoop',

ambari-server/src/test/python/stacks/1.3.2/configs/default.json

@@ -370,6 +370,9 @@
         },
         "pig-log4j": {
             "property1": "value1"
+        },
+        "oozie-log4j": {
+            "property1": "value1"
         }
     }, 
     "configurationTags": {

ambari-server/src/test/python/stacks/1.3.2/configs/secured.json

@@ -475,6 +475,9 @@
         },
         "pig-log4j": {
             "property1": "value1"
+        },
+        "oozie-log4j": {
+            "property1": "value1"
         }
     }, 
     "configurationTags": {

ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_client.py

@@ -45,6 +45,13 @@ class TestOozieClient(RMFTestCase):
     self.assertResourceCalled('TemplateConfig', '/etc/oozie/conf/oozie-env.sh',
         owner = 'oozie',
         )
+    self.assertResourceCalled('PropertiesFile', 'oozie-log4j.properties',
+        owner = 'oozie',
+        group = 'hadoop',
+        mode = 0664,
+        dir = '/etc/oozie/conf',
+        properties = self.getConfig()['configurations']['oozie-log4j'],
+        )
     self.assertResourceCalled('File', '/etc/oozie/conf/adminusers.txt',
         owner = 'oozie',
         group = 'hadoop',
@@ -91,6 +98,13 @@ class TestOozieClient(RMFTestCase):
     self.assertResourceCalled('TemplateConfig', '/etc/oozie/conf/oozie-env.sh',
                               owner = 'oozie',
                               )
+    self.assertResourceCalled('PropertiesFile', 'oozie-log4j.properties',
+                              owner = 'oozie',
+                              group = 'hadoop',
+                              mode = 0664,
+                              dir = '/etc/oozie/conf',
+                              properties = self.getConfig()['configurations']['oozie-log4j'],
+                              )
     self.assertResourceCalled('File', '/etc/oozie/conf/adminusers.txt',
                               owner = 'oozie',
                               group = 'hadoop',

ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py

@@ -138,6 +138,13 @@ class TestOozieServer(RMFTestCase):
     self.assertResourceCalled('TemplateConfig', '/etc/oozie/conf/oozie-env.sh',
                               owner = 'oozie',
                               )
+    self.assertResourceCalled('PropertiesFile', 'oozie-log4j.properties',
+                              owner = 'oozie',
+                              group = 'hadoop',
+                              mode = 0664,
+                              dir = '/etc/oozie/conf',
+                              properties = self.getConfig()['configurations']['oozie-log4j'],
+                              )
     self.assertResourceCalled('File', '/etc/oozie/conf/adminusers.txt',
                               owner = 'oozie',
                               group = 'hadoop',
@@ -231,6 +238,13 @@ class TestOozieServer(RMFTestCase):
     self.assertResourceCalled('TemplateConfig', '/etc/oozie/conf/oozie-env.sh',
                               owner = 'oozie',
                               )
+    self.assertResourceCalled('PropertiesFile', 'oozie-log4j.properties',
+                              owner = 'oozie',
+                              group = 'hadoop',
+                              mode = 0664,
+                              dir = '/etc/oozie/conf',
+                              properties = self.getConfig()['configurations']['oozie-log4j'],
+                              )
     self.assertResourceCalled('File', '/etc/oozie/conf/adminusers.txt',
                               owner = 'oozie',
                               group = 'hadoop',

ambari-server/src/test/python/stacks/2.0.6/configs/default.json

@@ -510,6 +510,9 @@
         },
         "pig-log4j": {
             "property1": "value1"
+        },
+        "oozie-log4j": {
+            "property1": "value1"
         }
     },
     "configurationTags": {

ambari-server/src/test/python/stacks/2.0.6/configs/secured.json

@@ -637,6 +637,9 @@
         },
         "pig-log4j": {
             "property1": "value1"
+        },
+        "oozie-log4j": {
+            "property1": "value1"
         }
     }, 
     "configurationTags": {