openstack
/
heat
Code Issues Proposed changes

Wait for all resources to get updated before asserting state 

Change-Id: Ieec2c9d540c30c3e4da5b38026daf60de286b2ff
Closes-bug: 1417077
This commit is contained in:
Angus Salkeld 2015-02-03 11:27:40 +10:00
parent 127d4cea33
commit 78da88dd77
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
heat_integrationtests/functional/test_instance_group.py
View File

@ -270,6 +270,8 @@ class InstanceGroupBasicTest(InstanceGroupTest):
nested_ident = self.assert_resource_is_a_stack(stack_identifier,
'JobServerGroup')
self._assert_instance_state(nested_ident, 2, 0)
initial_list = [res.resource_name
for res in self.client.resources.list(nested_ident)]
env['parameters']['size'] = 3
files2 = {'provider.yaml': self.bad_instance_template}
@ -283,10 +285,19 @@ class InstanceGroupBasicTest(InstanceGroupTest):
)
self._wait_for_stack_status(stack_identifier, 'UPDATE_FAILED')
# assert that there are 3 bad instances
nested_ident = self.assert_resource_is_a_stack(stack_identifier,
'JobServerGroup')
self._assert_instance_state(nested_ident, 0, 3)
# assert that there are 3 bad instances
# 2 resources should be in update failed, and one create failed.
for res in self.client.resources.list(nested_ident):
if res.resource_name in initial_list:
self._wait_for_resource_status(nested_ident,
res.resource_name,
'UPDATE_FAILED')
else:
self._wait_for_resource_status(nested_ident,
res.resource_name,
'CREATE_FAILED')
class InstanceGroupUpdatePolicyTest(InstanceGroupTest):