openstack/deb-heat
Code Issues Proposed changes

Change ResDataNestedStackTest to not use a nested stack

Browse Source 
It is testing that resource data is deleted, our stack's are
isolated enough now that this can just be tested in a single stack.

part of blueprint decouple-nested

Change-Id: I3a0ba30acbbbbf34a7551b1e87e7c837beee5b7e
This commit is contained in:
Angus Salkeld 2015-02-18 12:30:39 +10:00
parent 5f37259d9c
commit e916fa3b20
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
heat/tests/test_nested_stack.py
View File

@ -283,15 +283,14 @@ class ResDataResource(generic_rsrc.GenericResource):
self.data_set("test", 'A secret value', True) self.data_set("test", 'A secret value', True)
class ResDataNestedStackTest(NestedStackTest): class ResDataStackTest(common.HeatTestCase):
template = '''
nested_template = '''
HeatTemplateFormatVersion: "2012-12-12" HeatTemplateFormatVersion: "2012-12-12"
Parameters: Parameters:
KeyName: KeyName:
Type: String Type: String
Resources: Resources:
nested_res: res:
Type: "res.data.resource" Type: "res.data.resource"
Outputs: Outputs:
Foo: Foo:
@ -299,22 +298,19 @@ Outputs:
''' '''
def setUp(self): def setUp(self):
super(ResDataNestedStackTest, self).setUp() super(ResDataStackTest, self).setUp()
resource._register_class("res.data.resource", ResDataResource) resource._register_class("res.data.resource", ResDataResource)
def create_stack(self, template): def create_stack(self, template):
t = template_format.parse(template) t = template_format.parse(template)
stack = self.parse_stack(t) stack = utils.parse_stack(t)
stack.create() stack.create()
self.assertEqual((stack.CREATE, stack.COMPLETE), stack.state) self.assertEqual((stack.CREATE, stack.COMPLETE), stack.state)
return stack return stack
def test_res_data_delete(self): def test_res_data_delete(self):
urlfetch.get('https://server.test/the.template').AndReturn( stack = self.create_stack(self.template)
self.nested_template) res = stack['res']
self.m.ReplayAll()
stack = self.create_stack(self.test_template)
res = stack['the_nested'].nested()['nested_res']
stack.delete() stack.delete()
self.assertEqual((stack.DELETE, stack.COMPLETE), stack.state) self.assertEqual((stack.DELETE, stack.COMPLETE), stack.state)
self.assertRaises(exception.NotFound, db_api.resource_data_get, res, self.assertRaises(exception.NotFound, db_api.resource_data_get, res,