Merge "Add group property for OS::Heat::MultipartMime"

1 files changed, 11 insertions, 3 deletions

diff --git a/heat/tests/openstack/heat/test_multi_part.py b/heat/tests/openstack/heat/test_multi_part.py
index 85919dfc9..3d2b244c8 100644
--- a/heat/tests/openstack/heat/test_multi_part.py
+++ b/heat/tests/openstack/heat/test_multi_part.py
@@ -31,7 +31,7 @@ class MultipartMimeTest(common.HeatTestCase):
         self.ctx = utils.dummy_context()
         self.init_config()
 
-    def init_config(self, parts=None):
+    def init_config(self, parts=None, group='Heat::Ungrouped'):
         parts = parts or []
         stack = parser.Stack(
             self.ctx, 'software_config_test_stack',
@@ -41,13 +41,15 @@ class MultipartMimeTest(common.HeatTestCase):
                     'config_mysql': {
                         'Type': 'OS::Heat::MultipartMime',
                         'Properties': {
+                            'group': group,
                             'parts': parts
                         }}}}))
         self.config = stack['config_mysql']
         self.rpc_client = mock.MagicMock()
         self.config._rpc_client = self.rpc_client
 
-    def test_handle_create(self):
+    def _test_create(self, group='Heat::Ungrouped'):
+        self.init_config(group=group)
         config_id = 'c8a19429-7fde-47ea-a42f-40045488226c'
         sc = {'id': config_id}
         self.rpc_client.create_software_config.return_value = sc
@@ -59,9 +61,15 @@ class MultipartMimeTest(common.HeatTestCase):
         self.assertEqual({
             'name': self.config.physical_resource_name(),
             'config': self.config.message,
-            'group': 'Heat::Ungrouped'
+            'group': group
         }, kwargs)
 
+    def test_handle_create(self):
+        self._test_create()
+
+    def test_handle_create_with_group(self):
+        self._test_create(group='script')
+
     def test_get_message_not_none(self):
         self.config.message = 'Not none'
         result = self.config.get_message()