diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-12 00:55:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-12 00:55:49 +0000 |
| commit | ae251b99a3fb6aa99ec8898152d79dfa2c026a92 (patch) | |
| tree | 430637af63709c723ccdbb943fec2b5b35e1df96 /nova/tests | |
| parent | 67069a3d1a4174fae987c8e3a7091b6fd37ff606 (diff) | |
| parent | d8d7d148fe2c185f2efda0c4cfc2ca125d4008d7 (diff) | |
Merge "Pass migration_ref when when auto-confirming"
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/compute/test_compute.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py index e94d8b788..0e41678b3 100644 --- a/nova/tests/compute/test_compute.py +++ b/nova/tests/compute/test_compute.py @@ -3414,13 +3414,15 @@ class ComputeTestCase(BaseTestCase): if migration['id'] == m['id']: migration['status'] = status - def fake_confirm_resize(context, instance): + def fake_confirm_resize(context, instance, migration_ref=None): # raise exception for 'fake_uuid4' to check migration status # does not get set to 'error' on confirm_resize failure. if instance['uuid'] == 'fake_uuid4': raise test.TestingException + self.assertNotEqual(migration_ref, None) for migration in migrations: - if migration['instance_uuid'] == instance['uuid']: + if (migration['instance_uuid'] == + migration_ref['instance_uuid']): migration['status'] = 'confirmed' self.stubs.Set(db, 'instance_get_by_uuid', |