openstack/nova
Code Issues Proposed changes

Merge "fix unstable shelve offload functional tests"

Browse Source
This commit is contained in:
Jenkins
2017-10-05 19:13:11 +00:00
committed by Gerrit Code Review
parent 54d8312347 b5dca17f74
commit ec4e970412
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nova/tests/functional/test_servers.py
View File

@@ -1963,7 +1963,9 @@ class ServerMovingTests(ProviderUsageBaseTestCase):
'shelveOffload': {}
}
self.api.post_server_action(server['id'], req)
self._wait_for_state_change(self.api, server, 'SHELVED_OFFLOADED')
self._wait_for_server_parameter(
self.api, server, {'status': 'SHELVED_OFFLOADED',
'OS-EXT-SRV-ATTR:host': None})
source_usages = self._get_provider_usages(source_rp_uuid)
self.assertEqual({'VCPU': 0,
'MEMORY_MB': 0,
@@ -2656,7 +2658,9 @@ class ServerUnshelveSpawnFailTests(ProviderUsageBaseTestCase):
# shelve offload the server
self.flags(shelved_offload_time=0)
self.api.post_server_action(server['id'], {'shelve': None})
self._wait_for_state_change(self.api, server, 'SHELVED_OFFLOADED')
self._wait_for_server_parameter(
self.api, server, {'status': 'SHELVED_OFFLOADED',
'OS-EXT-SRV-ATTR:host': None})
# assert allocations were removed from the host
usages = self._get_provider_usages(rp_uuid)