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
This commit is contained in:
parent
c8ce68ff5e
commit
bc1701c0d3
|
@ -18,6 +18,7 @@ import six
|
||||||
|
|
||||||
from heat.common import exception
|
from heat.common import exception
|
||||||
from heat.common import template_format
|
from heat.common import template_format
|
||||||
|
from heat.engine import resource
|
||||||
from heat.engine.resources.openstack.manila import share as mshare
|
from heat.engine.resources.openstack.manila import share as mshare
|
||||||
from heat.engine import rsrc_defn
|
from heat.engine import rsrc_defn
|
||||||
from heat.engine import scheduler
|
from heat.engine import scheduler
|
||||||
|
@ -113,18 +114,18 @@ class ManilaShareTest(common.HeatTestCase):
|
||||||
|
|
||||||
def test_share_create_fail(self):
|
def test_share_create_fail(self):
|
||||||
share = self._init_share("stack_share_create_fail")
|
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
|
share.client().shares.get.return_value = self.failed_share
|
||||||
exc = self.assertRaises(exception.ResourceFailure,
|
exc = self.assertRaises(resource.ResourceInError,
|
||||||
scheduler.TaskRunner(share.create))
|
share.check_create_complete,
|
||||||
|
self.failed_share)
|
||||||
self.assertIn("Error during creation", six.text_type(exc))
|
self.assertIn("Error during creation", six.text_type(exc))
|
||||||
|
|
||||||
def test_share_create_unknown_status(self):
|
def test_share_create_unknown_status(self):
|
||||||
share = self._init_share("stack_share_create_unknown")
|
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
|
share.client().shares.get.return_value = self.deleting_share
|
||||||
exc = self.assertRaises(exception.ResourceFailure,
|
exc = self.assertRaises(resource.ResourceUnknownStatus,
|
||||||
scheduler.TaskRunner(share.create))
|
share.check_create_complete,
|
||||||
|
self.deleting_share)
|
||||||
self.assertIn("Unknown status", six.text_type(exc))
|
self.assertIn("Unknown status", six.text_type(exc))
|
||||||
|
|
||||||
def test_share_delete(self):
|
def test_share_delete(self):
|
||||||
|
|
Loading…
Reference in New Issue