openstack
/
heat
Code Issues Proposed changes

Merge "Refactor test_share_create_failed test for Manila"

This commit is contained in:
Jenkins 2015-07-08 10:05:31 +00:00 committed by Gerrit Code Review
parent 00afffd6a2 bc1701c0d3
commit 59cb0548af
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
heat/tests/manila/test_manila_share.py
View File

@ -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):