AMBARI-4609. Unit tests failing with pop from empty list error.

(Vitaliy Semenyk via aonishuk)

ambari-server/src/test/python/stacks/1.3.2/PIG/test_pig_client.py

@@ -28,7 +28,6 @@ class TestPigClient(RMFTestCase):
                        command = "configure",
                        config_file="default.json"
     )
-    
     self.assertResourceCalled('Directory', '/etc/pig/conf',
       owner = 'hdfs',
       group = 'hadoop',
@@ -39,20 +38,23 @@ class TestPigClient(RMFTestCase):
     self.assertResourceCalled('TemplateConfig', '/etc/pig/conf/pig.properties',
       owner = 'hdfs',
     )
-    self.assertResourceCalled('File', '/etc/pig/conf/log4j.properties',
+    self.assertResourceCalled('PropertiesFile', 'log4j.properties',
       owner = 'hdfs',
       group = 'hadoop',
-      mode = 0644,
+      mode = 0664,
+      dir = '/etc/pig/conf',
+      properties = self.getConfig()['configurations']['pig-log4j'],
     )
     self.assertNoMoreResources()
 
+
+
   def test_configure_secured(self):
     self.executeScript("1.3.2/services/PIG/package/scripts/pig_client.py",
                        classname = "PigClient",
                        command = "configure",
                        config_file="secured.json"
     )
-    
     self.assertResourceCalled('Directory', '/etc/pig/conf',
       owner = 'hdfs',
       group = 'hadoop',
@@ -63,9 +65,11 @@ class TestPigClient(RMFTestCase):
     self.assertResourceCalled('TemplateConfig', '/etc/pig/conf/pig.properties',
       owner = 'hdfs',
     )
-    self.assertResourceCalled('File', '/etc/pig/conf/log4j.properties',
+    self.assertResourceCalled('PropertiesFile', 'log4j.properties',
       owner = 'hdfs',
       group = 'hadoop',
-      mode = 0644,
+      mode = 0664,
+      dir = '/etc/pig/conf',
+      properties = self.getConfig()['configurations']['pig-log4j'],
     )
     self.assertNoMoreResources()

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

@@ -367,6 +367,9 @@
         },
         "zookeeper-log4j": {
             "property1": "value1"
+        },
+        "pig-log4j": {
+            "property1": "value1"
         }
     }, 
     "configurationTags": {

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

@@ -472,6 +472,9 @@
         },
         "zookeeper-log4j": {
             "property1": "value1"
+        },
+        "pig-log4j": {
+            "property1": "value1"
         }
     }, 
     "configurationTags": {

ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_client.py

@@ -28,7 +28,6 @@ class TestPigClient(RMFTestCase):
                        command = "configure",
                        config_file="default.json"
     )
-
     self.assertResourceCalled('Directory', '/etc/pig/conf',
       owner = 'hdfs',
       group = 'hadoop',
@@ -39,20 +38,21 @@ class TestPigClient(RMFTestCase):
     self.assertResourceCalled('TemplateConfig', '/etc/pig/conf/pig.properties',
       owner = 'hdfs',
     )
-    self.assertResourceCalled('File', '/etc/pig/conf/log4j.properties',
+    self.assertResourceCalled('PropertiesFile', 'log4j.properties',
       owner = 'hdfs',
       group = 'hadoop',
-      mode = 0644,
+      mode = 0664,
+      dir = '/etc/pig/conf',
+      properties = self.getConfig()['configurations']['pig-log4j'],
     )
     self.assertNoMoreResources()
-
+    
   def test_configure_secured(self):
     self.executeScript("2.0.6/services/PIG/package/scripts/pig_client.py",
                        classname = "PigClient",
                        command = "configure",
                        config_file="secured.json"
     )
-    
     self.assertResourceCalled('Directory', '/etc/pig/conf',
       owner = 'hdfs',
       group = 'hadoop',
@@ -63,9 +63,11 @@ class TestPigClient(RMFTestCase):
     self.assertResourceCalled('TemplateConfig', '/etc/pig/conf/pig.properties',
       owner = 'hdfs',
     )
-    self.assertResourceCalled('File', '/etc/pig/conf/log4j.properties',
+    self.assertResourceCalled('PropertiesFile', 'log4j.properties',
       owner = 'hdfs',
       group = 'hadoop',
-      mode = 0644,
+      mode = 0664,
+      dir = '/etc/pig/conf',
+      properties = self.getConfig()['configurations']['pig-log4j'],
     )
     self.assertNoMoreResources()

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

@@ -507,6 +507,9 @@
         },
         "zookeeper-log4j": {
             "property1": "value1"
+        },
+        "pig-log4j": {
+            "property1": "value1"
         }
     },
     "configurationTags": {

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

@@ -634,6 +634,9 @@
         },
         "zookeeper-log4j": {
             "property1": "value1"
+        },
+        "pig-log4j": {
+            "property1": "value1"
         }
     }, 
     "configurationTags": {