diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-08-09 17:04:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-08-09 17:04:39 +0000 |
| commit | eb1538763450d7d0f95d4c29ff54f4bf7defaa09 (patch) | |
| tree | b0b6c2708711ba4897e7679dcd7558bd2a95b8b3 /nova/tests | |
| parent | fd00534df464095c780dd2e5a292b4d3696ad375 (diff) | |
| parent | c45eb1fe80e6e224b0617fb3d789949c0d0b8dd1 (diff) | |
Merge "Fix stale instances being sent over rpc."
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/api/openstack/compute/test_server_actions.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nova/tests/api/openstack/compute/test_server_actions.py b/nova/tests/api/openstack/compute/test_server_actions.py index 851fb57f2..f062dd5a9 100644 --- a/nova/tests/api/openstack/compute/test_server_actions.py +++ b/nova/tests/api/openstack/compute/test_server_actions.py @@ -41,7 +41,7 @@ def return_server_not_found(context, uuid): def instance_update(context, instance_uuid, kwargs): - inst = fakes.stub_instance(INSTANCE_IDS[instance_uuid]) + inst = fakes.stub_instance(INSTANCE_IDS[instance_uuid], host='fake_host') return (inst, inst) @@ -463,7 +463,8 @@ class ServerActionsControllerTest(test.TestCase): update(context, mox.IgnoreArg(), image_ref=self._image_href, task_state=task_states.REBUILDING, - progress=0, **attributes).AndReturn(None) + progress=0, **attributes).AndReturn( + fakes.stub_instance(1, host='fake_host')) self.mox.ReplayAll() self.controller._action_rebuild(req, FAKE_UUID, body) |