diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-11 22:46:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-11 22:46:20 +0000 |
| commit | 0dc8632659bf707e70fdf822e046d9c1482d833e (patch) | |
| tree | 91a9a9c07d59f2ae8f2c4a710a7e1b28bb51ac33 /nova/tests/conductor | |
| parent | 2dd6adac8304547fbb2d80b1c4ef659e53048cf9 (diff) | |
| parent | a381df91b46582528685d4695019a5e18f5f702a (diff) | |
| download | nova-0dc8632659bf707e70fdf822e046d9c1482d833e.tar.gz nova-0dc8632659bf707e70fdf822e046d9c1482d833e.tar.xz nova-0dc8632659bf707e70fdf822e046d9c1482d833e.zip | |
Merge "Refactors get_instance_security_groups to only use instance_uuid"
Diffstat (limited to 'nova/tests/conductor')
| -rw-r--r-- | nova/tests/conductor/test_conductor.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/tests/conductor/test_conductor.py b/nova/tests/conductor/test_conductor.py index 03896ee3a..beb0d3b61 100644 --- a/nova/tests/conductor/test_conductor.py +++ b/nova/tests/conductor/test_conductor.py @@ -274,10 +274,10 @@ class _BaseTestCase(object): self.assertEqual(result, 'foo') def test_security_group_get_by_instance(self): - fake_instance = {'id': 'fake-instance'} + fake_instance = {'uuid': 'fake-instance'} self.mox.StubOutWithMock(db, 'security_group_get_by_instance') db.security_group_get_by_instance( - self.context, fake_instance['id']).AndReturn('it worked') + self.context, fake_instance['uuid']).AndReturn('it worked') self.mox.ReplayAll() result = self.conductor.security_group_get_by_instance(self.context, fake_instance) |