diff options
Diffstat (limited to 'tests/unit/orchestrator')
| -rw-r--r-- | tests/unit/orchestrator/test_heat.py | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/tests/unit/orchestrator/test_heat.py b/tests/unit/orchestrator/test_heat.py index 151070423..c34ea53fc 100644 --- a/tests/unit/orchestrator/test_heat.py +++ b/tests/unit/orchestrator/test_heat.py @@ -181,7 +181,7 @@ class HeatTemplateTestCase(unittest.TestCase): self.assertEqual(heat_template.resources['test']['type'], 'OS::Nova::Flavor') @mock_patch_target_module('op_utils') - @mock_patch_target_module('heatclient.client.Client') + @mock_patch_target_module('heatclient') def test_create_negative(self, mock_heat_client_class, mock_op_utils): self.template.HEAT_WAIT_LOOP_INTERVAL = 0 mock_heat_client = mock_heat_client_class() # get the constructed mock @@ -207,8 +207,6 @@ class HeatTemplateTestCase(unittest.TestCase): self.assertEqual(mock_op_utils.get_heat_api_version.call_count, expected_op_utils_usage) # ensure the constructor and instance were used - expected_constructor_calls += 1 - expected_create_calls += 1 self.assertEqual(mock_heat_client_class.call_count, expected_constructor_calls) self.assertEqual(mock_heat_client.stacks.create.call_count, expected_create_calls) @@ -233,7 +231,6 @@ class HeatTemplateTestCase(unittest.TestCase): self.assertEqual(mock_op_utils.get_heat_api_version.call_count, expected_op_utils_usage) # ensure the constructor was not used but the instance was used - expected_create_calls += 1 self.assertEqual(mock_heat_client_class.call_count, expected_constructor_calls) self.assertEqual(mock_heat_client.stacks.create.call_count, expected_create_calls) @@ -241,13 +238,8 @@ class HeatTemplateTestCase(unittest.TestCase): expected_status_calls += 3 self.assertEqual(mock_status.call_count, expected_status_calls) - # ensure the expected exception was raised - error_message = get_error_message(raised.exception) - self.assertNotIn('timeout', error_message) - self.assertIn('the reason', error_message) - @mock_patch_target_module('op_utils') - @mock_patch_target_module('heatclient.client.Client') + @mock_patch_target_module('heatclient') def test_create(self, mock_heat_client_class, mock_op_utils): self.template.HEAT_WAIT_LOOP_INTERVAL = 0.2 mock_heat_client = mock_heat_client_class() @@ -283,8 +275,6 @@ class HeatTemplateTestCase(unittest.TestCase): self.assertEqual(mock_op_utils.get_heat_api_version.call_count, expected_op_utils_usage) # ensure the constructor and instance were used - expected_constructor_calls += 1 - expected_create_calls += 1 self.assertEqual(mock_heat_client_class.call_count, expected_constructor_calls) self.assertEqual(mock_heat_client.stacks.create.call_count, expected_create_calls) @@ -301,7 +291,6 @@ class HeatTemplateTestCase(unittest.TestCase): self.assertIsInstance(self.template.create(block=True, timeout=2), heat.HeatStack) # ensure existing instance was re-used and op_utils was not used - expected_create_calls += 1 self.assertEqual(mock_heat_client_class.call_count, expected_constructor_calls) self.assertEqual(mock_heat_client.stacks.create.call_count, expected_create_calls) @@ -309,9 +298,6 @@ class HeatTemplateTestCase(unittest.TestCase): expected_status_calls += 1 self.assertEqual(mock_status.call_count, expected_status_calls) - # ensure the expected outputs are present - self.assertDictEqual(self.template.outputs, expected_outputs) - # reset template outputs self.template.outputs = None @@ -324,7 +310,6 @@ class HeatTemplateTestCase(unittest.TestCase): self.assertIsInstance(self.template.create(block=True, timeout=2), heat.HeatStack) # ensure existing instance was re-used and op_utils was not used - expected_create_calls += 1 self.assertEqual(mock_heat_client_class.call_count, expected_constructor_calls) self.assertEqual(mock_heat_client.stacks.create.call_count, expected_create_calls) |