diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-21 10:35:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-21 10:35:35 +0000 |
| commit | 7a07e2b6b497613bf4a9dba2ebc5a5a6bca902c9 (patch) | |
| tree | 1db40b87c6508e18e3654600f964cf3dfa738df2 /nova/tests | |
| parent | a02766e28101381207ea7a48396a9448ca610348 (diff) | |
| parent | ff4194bec79067bf77ab25caec1e40ad3709ea07 (diff) | |
Merge "Make _poll_unconfirmed_resizes() use objects"
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/compute/test_compute.py | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py index dc828cef8..928934f61 100644 --- a/nova/tests/compute/test_compute.py +++ b/nova/tests/compute/test_compute.py @@ -4441,19 +4441,27 @@ class ComputeTestCase(BaseTestCase): self.assertTrue(instance) def test_poll_unconfirmed_resizes(self): - instances = [{'uuid': 'fake_uuid1', 'vm_state': vm_states.RESIZED, - 'task_state': None}, - {'uuid': 'noexist'}, - {'uuid': 'fake_uuid2', 'vm_state': vm_states.ERROR, - 'task_state': None}, - {'uuid': 'fake_uuid3', 'vm_state': vm_states.ACTIVE, - 'task_state': task_states.REBOOTING}, - {'uuid': 'fake_uuid4', 'vm_state': vm_states.RESIZED, - 'task_state': None}, - {'uuid': 'fake_uuid5', 'vm_state': vm_states.ACTIVE, - 'task_state': None}, - {'uuid': 'fake_uuid6', 'vm_state': vm_states.RESIZED, - 'task_state': 'deleting'}] + instances = [ + fake_instance.fake_db_instance(uuid='fake_uuid1', + vm_state=vm_states.RESIZED, + task_state=None), + fake_instance.fake_db_instance(uuid='noexist'), + fake_instance.fake_db_instance(uuid='fake_uuid2', + vm_state=vm_states.ERROR, + task_state=None), + fake_instance.fake_db_instance(uuid='fake_uuid3', + vm_state=vm_states.ACTIVE, + task_state= + task_states.REBOOTING), + fake_instance.fake_db_instance(uuid='fake_uuid4', + vm_state=vm_states.RESIZED, + task_state=None), + fake_instance.fake_db_instance(uuid='fake_uuid5', + vm_state=vm_states.ACTIVE, + task_state=None), + fake_instance.fake_db_instance(uuid='fake_uuid6', + vm_state=vm_states.RESIZED, + task_state='deleting')] expected_migration_status = {'fake_uuid1': 'confirmed', 'noexist': 'error', 'fake_uuid2': 'error', |