X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=yardstick%2Ftests%2Funit%2Forchestrator%2Ftest_heat.py;h=e0a353812685f6c2a632af6b8d6e5cf67ff54085;hb=009140f8947fc42f4d049c6d414ad7b18f32be35;hp=9164197b805f4d7debcb1dc22d19077387d759d8;hpb=62699b55160b4308e80c0e98ace98ecf4c2eacb9;p=yardstick.git

diff --git a/yardstick/tests/unit/orchestrator/test_heat.py b/yardstick/tests/unit/orchestrator/test_heat.py
index 9164197b8..e0a353812 100644
--- a/yardstick/tests/unit/orchestrator/test_heat.py
+++ b/yardstick/tests/unit/orchestrator/test_heat.py
@@ -59,7 +59,7 @@ class HeatStackTestCase(unittest.TestCase):
         with mock.patch.object(tempfile._TemporaryFileWrapper, '__enter__',
                                return_value=mock_tfile):
             self.heatstack.create(template, heat_parameters, True, 100)
-            mock_tfile.write.assert_called_once_with(jsonutils.dumps(template))
+            mock_tfile.write.assert_called_once_with(jsonutils.dump_as_bytes(template))
             mock_tfile.close.assert_called_once()
 
         self.mock_stack_create.assert_called_once_with(
@@ -89,6 +89,18 @@ class HeatStackTestCase(unittest.TestCase):
         self.assertFalse(heat._DEPLOYED_STACKS)
         self.mock_stack_delete.assert_called_once_with(id, wait=True)
 
+    def test_delete_bug_in_shade(self):
+        id = uuidutils.generate_uuid()
+        self.heatstack._stack = FakeStack(
+            outputs=mock.Mock(), status=mock.Mock(), id=id)
+        heat._DEPLOYED_STACKS[id] = self.heatstack._stack
+        self.mock_stack_delete.side_effect = TypeError()
+
+        ret = self.heatstack.delete(wait=True)
+        self.assertTrue(ret)
+        self.assertFalse(heat._DEPLOYED_STACKS)
+        self.mock_stack_delete.assert_called_once_with(id, wait=True)
+
 
 class HeatTemplateTestCase(unittest.TestCase):