From bc1701c0d39fa6ba264bf4c829319273ca47287e Mon Sep 17 00:00:00 2001 From: Peter Razumovsky Date: Tue, 7 Jul 2015 12:25:05 +0300 Subject: [PATCH] Refactor test_share_create_failed test for Manila test_share_create_failed check that check_create_complete raises ResourceInError exception, but there is no necessity to create whole resource, because if ResourceInError has been raised, heat tries to recreate stack, thereforce test_share_create_failed runs 68 seconds. Now test only checks correct raising ResourceInError in check_create_complete. Also, test_share_create_unknown_status was refactored in such way. Change-Id: I5093a49bda00c676ef805dff1ecfb2e2db803a9c --- heat/tests/manila/test_manila_share.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/heat/tests/manila/test_manila_share.py b/heat/tests/manila/test_manila_share.py index 2a59242eb1..ab7d9e264f 100644 --- a/heat/tests/manila/test_manila_share.py +++ b/heat/tests/manila/test_manila_share.py @@ -18,6 +18,7 @@ import six from heat.common import exception from heat.common import template_format +from heat.engine import resource from heat.engine.resources.openstack.manila import share as mshare from heat.engine import rsrc_defn from heat.engine import scheduler @@ -113,18 +114,18 @@ class ManilaShareTest(common.HeatTestCase): def test_share_create_fail(self): share = self._init_share("stack_share_create_fail") - share.client().shares.create.return_value = self.fake_share share.client().shares.get.return_value = self.failed_share - exc = self.assertRaises(exception.ResourceFailure, - scheduler.TaskRunner(share.create)) + exc = self.assertRaises(resource.ResourceInError, + share.check_create_complete, + self.failed_share) self.assertIn("Error during creation", six.text_type(exc)) def test_share_create_unknown_status(self): share = self._init_share("stack_share_create_unknown") - share.client().shares.create.return_value = self.fake_share share.client().shares.get.return_value = self.deleting_share - exc = self.assertRaises(exception.ResourceFailure, - scheduler.TaskRunner(share.create)) + exc = self.assertRaises(resource.ResourceUnknownStatus, + share.check_create_complete, + self.deleting_share) self.assertIn("Unknown status", six.text_type(exc)) def test_share_delete(self):