diff options
Diffstat (limited to 'nova/tests/functional/integrated_helpers.py')
| -rw-r--r-- | nova/tests/functional/integrated_helpers.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/nova/tests/functional/integrated_helpers.py b/nova/tests/functional/integrated_helpers.py index 311ac6314c..30de23259f 100644 --- a/nova/tests/functional/integrated_helpers.py +++ b/nova/tests/functional/integrated_helpers.py @@ -556,9 +556,11 @@ class InstanceHelperMixin: self.api.post_server_action(server['id'], {'os-start': None}) return self._wait_for_state_change(server, 'ACTIVE') - def _stop_server(self, server): + def _stop_server(self, server, wait_for_stop=True): self.api.post_server_action(server['id'], {'os-stop': None}) - return self._wait_for_state_change(server, 'SHUTOFF') + if wait_for_stop: + return self._wait_for_state_change(server, 'SHUTOFF') + return server class PlacementHelperMixin: |