summaryrefslogtreecommitdiff
path: root/nova/tests/functional/integrated_helpers.py
diff options
context:
space:
mode:
Diffstat (limited to 'nova/tests/functional/integrated_helpers.py')
-rw-r--r--nova/tests/functional/integrated_helpers.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/nova/tests/functional/integrated_helpers.py b/nova/tests/functional/integrated_helpers.py
index 0ecafbe81d..35b422f7e5 100644
--- a/nova/tests/functional/integrated_helpers.py
+++ b/nova/tests/functional/integrated_helpers.py
@@ -380,10 +380,11 @@ class InstanceHelperMixin(object):
server_expected_state='ACTIVE'):
self.api.post_server_action(
server['id'],
- {'os-migrateLive': {'host': None,
- 'block_migration': 'auto'}})
- self._wait_for_state_change(self.api, server, server_expected_state)
+ {'os-migrateLive': {'host': None, 'block_migration': 'auto'}})
+ server = self._wait_for_state_change(
+ self.api, server, server_expected_state)
self._wait_for_migration_status(server, [migration_expected_state])
+ return server
class ProviderUsageBaseTestCase(test.TestCase, InstanceHelperMixin):