diff options
| author | John Tran <jtran@attinteractive.com> | 2011-03-29 13:43:00 -0700 |
|---|---|---|
| committer | John Tran <jtran@attinteractive.com> | 2011-03-29 13:43:00 -0700 |
| commit | ee00cb8057eac328c98dd9c040ffa324f11a87be (patch) | |
| tree | 22d7e15f95efc4097526dab7d4370f1b6ed075e1 | |
| parent | 1b67237d05e7103dc6b2beadd5782466682a136b (diff) | |
added blank lines in between functions & removed the test_describe_images (was meant for a diff bug lp682888)
| -rw-r--r-- | nova/tests/test_cloud.py | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/nova/tests/test_cloud.py b/nova/tests/test_cloud.py index 07e52a6be..582e40e08 100644 --- a/nova/tests/test_cloud.py +++ b/nova/tests/test_cloud.py @@ -217,27 +217,22 @@ class CloudTestCase(test.TestCase): db.service_destroy(self.context, comp1['id']) db.service_destroy(self.context, comp2['id']) - def test_describe_images(self): - def fake_detail(meh, context): - return [{'id': 1, 'properties': {'kernel_id': 1, 'ramdisk_id': 1, - 'type':'machine'}}] - self.stubs.Set(local.LocalImageService, 'detail', fake_detail) - result = self.cloud.describe_images(self.context) - result = result['imagesSet'][0] - self.assertEqual(result['imageId'], 'ami-00000001') - def test_deregister_image(self): deregister_image = self.cloud.deregister_image + def fake_delete(meh, context, id): return None + self.stubs.Set(local.LocalImageService, 'delete', fake_delete) # valid image result = deregister_image(self.context, 'ami-00000001') self.assertEqual(result['imageId'], 'ami-00000001') # invalid image self.stubs.UnsetAll() + def fake_detail_empty(meh, context): return [] + self.stubs.Set(local.LocalImageService, 'detail', fake_detail_empty) self.assertRaises(NotFound, deregister_image, self.context, 'ami-bad001') |