diff options
author | Zuul <zuul@review.opendev.org> | 2019-12-18 13:48:48 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2019-12-18 13:48:48 +0000 |
commit | 496e8df76bf2b80432c9c2b2af766587bfa546f0 (patch) | |
tree | 5ad491afb78d584d7763fa74783387bb24a65b8b /heat_integrationtests | |
parent | c7455722e1da03f3280b4b6b18966a2d7d6d9938 (diff) | |
parent | 3b4e0cda282e3df64daf16d64081faa47dd72135 (diff) | |
download | heat-496e8df76bf2b80432c9c2b2af766587bfa546f0.tar.gz |
Merge "Eliminate race in CancelUpdateTest"
Diffstat (limited to 'heat_integrationtests')
-rw-r--r-- | heat_integrationtests/functional/test_cancel_update.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/heat_integrationtests/functional/test_cancel_update.py b/heat_integrationtests/functional/test_cancel_update.py index bfeeda643..68ba3f447 100644 --- a/heat_integrationtests/functional/test_cancel_update.py +++ b/heat_integrationtests/functional/test_cancel_update.py @@ -58,4 +58,8 @@ resources: parameters=parameters, expected_status='UPDATE_IN_PROGRESS') + # Ensure we start updating the server before rolling back + self._wait_for_resource_status( + stack_identifier, 'Server', 'CREATE_IN_PROGRESS') + self.cancel_update_stack(stack_identifier) |