diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-03 20:06:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-03 20:06:37 +0000 |
| commit | 5d8e6130e4c1f5abf85dc87456b3844c4e6ccf0f (patch) | |
| tree | 91d10429cff317d6abdba35d95028fded5809ab5 /nova/tests | |
| parent | 587e03962f99300c089a1fe99aef567931a4c8ea (diff) | |
| parent | 58889a08fcce7407366f8aae0c703b4fa0480725 (diff) | |
Merge "Make ComputeManager _running_deleted_instances query by uuid"
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/compute/test_compute.py | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py index bbe8e0c81..7869b76cc 100644 --- a/nova/tests/compute/test_compute.py +++ b/nova/tests/compute/test_compute.py @@ -3132,16 +3132,12 @@ class ComputeTestCase(BaseTestCase): self.compute.host = instance['host'] - self.mox.StubOutWithMock(self.compute.driver, 'list_instances') - self.compute.driver.list_instances().AndReturn([instance['name']]) + self.mox.StubOutWithMock(self.compute, '_get_instances_on_driver') + self.compute._get_instances_on_driver(admin_context).AndReturn( + [instance]) self.flags(running_deleted_instance_timeout=3600, running_deleted_instance_action='reap') - self.mox.StubOutWithMock(self.compute.conductor_api, - "instance_get_all_by_host") - self.compute.conductor_api.instance_get_all_by_host( - admin_context, self.compute.host).AndReturn([instance]) - bdms = [] self.mox.StubOutWithMock(self.compute, "_shutdown_instance") @@ -3158,32 +3154,28 @@ class ComputeTestCase(BaseTestCase): self.compute._cleanup_running_deleted_instances(admin_context) def test_running_deleted_instances(self): - self.mox.StubOutWithMock(self.compute.driver, 'list_instances') - self.compute.driver.list_instances().AndReturn(['herp', 'derp']) + admin_context = context.get_admin_context() + self.compute.host = 'host' instance1 = {} - instance1['name'] = 'herp' instance1['deleted'] = True instance1['deleted_at'] = "sometimeago" instance2 = {} - instance2['name'] = 'derp' instance2['deleted'] = False instance2['deleted_at'] = None + self.mox.StubOutWithMock(self.compute, '_get_instances_on_driver') + self.compute._get_instances_on_driver(admin_context).AndReturn( + [instance1, instance2]) + self.mox.StubOutWithMock(timeutils, 'is_older_than') timeutils.is_older_than('sometimeago', CONF.running_deleted_instance_timeout).AndReturn(True) - self.mox.StubOutWithMock(self.compute.conductor_api, - "instance_get_all_by_host") - self.compute.conductor_api.instance_get_all_by_host('context', - 'host').AndReturn( - [instance1, - instance2]) self.mox.ReplayAll() - val = self.compute._running_deleted_instances('context') + val = self.compute._running_deleted_instances(admin_context) self.assertEqual(val, [instance1]) def test_get_instance_nw_info(self): |