openstack
/
heat
Code Issues Proposed changes

Fix unused variables 1/2: add more asserts 

Add test asserts for some unused local variables to make test better.

Change-Id: I8c830b4680a2ffe8bf1b7cbd44cd1dce5b27c919
This commit is contained in:
JUN JIE NAN 2014-01-07 11:49:02 +08:00
parent ba2503c2ff
commit 9174668355
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
heat/tests/test_engine_service.py
View File

@ -659,7 +659,7 @@ class StackServiceCreateUpdateDeleteTest(HeatTestCase):
old_stack = parser.Stack(self.ctx, stack_name, template)
sid = old_stack.store()
s = db_api.stack_get(self.ctx, sid)
self.assertIsNotNone(sid)
cfg.CONF.set_override('max_resources_per_stack', 2)

1
heat/tests/test_loadbalancer.py
View File

@ -215,6 +215,7 @@ class LoadBalancerTest(HeatTestCase):
s.store()
rsrc = self.create_loadbalancer(t, s, 'LoadBalancer')
self.assertEqual('LoadBalancer', rsrc.name)
self.m.VerifyAll()
def assertRegexpMatches(self, text, expected_regexp, msg=None):

6
heat/tests/test_parser.py
View File

@ -1944,11 +1944,17 @@ class StackTest(HeatTestCase):
def test_stack_name_valid(self):
stack = parser.Stack(self.ctx, 's', parser.Template({}))
self.assertIsInstance(stack, parser.Stack)
stack = parser.Stack(self.ctx, 'stack123', parser.Template({}))
self.assertIsInstance(stack, parser.Stack)
stack = parser.Stack(self.ctx, 'test.stack', parser.Template({}))
self.assertIsInstance(stack, parser.Stack)
stack = parser.Stack(self.ctx, 'test_stack', parser.Template({}))
self.assertIsInstance(stack, parser.Stack)
stack = parser.Stack(self.ctx, 'TEST', parser.Template({}))
self.assertIsInstance(stack, parser.Stack)
stack = parser.Stack(self.ctx, 'test-stack', parser.Template({}))
self.assertIsInstance(stack, parser.Stack)
def test_stack_name_invalid(self):
self.assertRaises(ValueError, parser.Stack, self.ctx, '_foo',

9
heat/tests/test_resource.py
View File

@ -57,6 +57,7 @@ class ResourceTest(HeatTestCase):
def test_resource_new_ok(self):
snippet = {'Type': 'GenericResourceType'}
res = resource.Resource('aresource', snippet, self.stack)
self.assertIsInstance(res, generic_rsrc.GenericResource)
def test_resource_new_err(self):
snippet = {'Type': 'NoExistResourceType'}
@ -330,7 +331,8 @@ class ResourceTest(HeatTestCase):
estr = 'Property error : test_resource: Property Foo not assigned'
create = scheduler.TaskRunner(res.create)
self.assertRaises(exception.ResourceFailure, create)
err = self.assertRaises(exception.ResourceFailure, create)
self.assertIn(estr, str(err))
self.assertEqual((res.CREATE, res.FAILED), res.state)
def test_create_fail_prop_typo(self):
@ -338,9 +340,10 @@ class ResourceTest(HeatTestCase):
rname = 'test_resource'
res = generic_rsrc.ResourceWithProps(rname, tmpl, self.stack)
estr = 'Property error : test_resource: Property Foo not assigned'
estr = 'StackValidationFailed: Unknown Property Food'
create = scheduler.TaskRunner(res.create)
self.assertRaises(exception.ResourceFailure, create)
err = self.assertRaises(exception.ResourceFailure, create)
self.assertIn(estr, str(err))
self.assertEqual((res.CREATE, res.FAILED), res.state)
def test_create_fail_metadata_parse_error(self):