diff options
| author | Zuul <zuul@review.opendev.org> | 2020-01-14 00:17:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-01-14 00:17:30 +0000 |
| commit | 7596a9a055de4e0c1a65c64d163fca58b6a3847f (patch) | |
| tree | e7d8b888d87b3e583601204d0d251a5a061e495d | |
| parent | 369d0c163029e90a4b2b6540eaf585f3da8cae3d (diff) | |
| parent | 25ba5b654aacdd384766dd18e0d616923705b1d2 (diff) | |
| download | heat-7596a9a055de4e0c1a65c64d163fca58b6a3847f.tar.gz | |
Merge "Eliminate race in CancelUpdateTest" into stable/train
| -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) |