diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-11-11 18:42:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-11-11 18:42:39 +0000 |
| commit | ed3635f40fa31b896bb700610b93fe288a90e692 (patch) | |
| tree | d0406a2ade46b979515a02711a4b22a8c7329655 /nova/tests | |
| parent | fb6a2d15be16f664b2159526fa339019ed4c204a (diff) | |
| parent | 231f40af80c69f80aec4922f1261f4fdf5365a3c (diff) | |
Merge "Converting set password to use instance objects"
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/api/openstack/test_server_actions.py | 4 | ||||
| -rw-r--r-- | nova/tests/test_compute.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nova/tests/api/openstack/test_server_actions.py b/nova/tests/api/openstack/test_server_actions.py index df0bfd968..9d50483b8 100644 --- a/nova/tests/api/openstack/test_server_actions.py +++ b/nova/tests/api/openstack/test_server_actions.py @@ -122,8 +122,8 @@ class MockSetAdminPassword(object): self.instance_id = None self.password = None - def __call__(self, context, instance_id, password): - self.instance_id = instance_id + def __call__(self, context, instance, password): + self.instance_id = instance['uuid'] self.password = password diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py index 9cf580b1f..20a8e3d5b 100644 --- a/nova/tests/test_compute.py +++ b/nova/tests/test_compute.py @@ -1182,7 +1182,7 @@ class ComputeAPITestCase(BaseTestCase): self.assertEqual(inst_ref['vm_state'], vm_states.ACTIVE) self.assertEqual(inst_ref['task_state'], None) - self.compute_api.set_admin_password(self.context, instance_id) + self.compute_api.set_admin_password(self.context, inst_ref) inst_ref = db.instance_get(self.context, instance_id) self.assertEqual(inst_ref['vm_state'], vm_states.ACTIVE) |