diff options
| author | Mike Scherbakov <mihgen@gmail.com> | 2011-06-02 10:29:58 +0400 |
|---|---|---|
| committer | Mike Scherbakov <mihgen@gmail.com> | 2011-06-02 10:29:58 +0400 |
| commit | b39b0e66f16d49890189c63fba528734ef476068 (patch) | |
| tree | 9b44159dd2157157f0f39df824d21dd4d4832da4 | |
| parent | fe77c55b7643bd9bd3bd988f7f759dde8af09cae (diff) | |
| download | nova-b39b0e66f16d49890189c63fba528734ef476068.tar.gz nova-b39b0e66f16d49890189c63fba528734ef476068.tar.xz nova-b39b0e66f16d49890189c63fba528734ef476068.zip | |
Refactored after review, fixed merge.
| -rw-r--r-- | nova/image/fake.py | 5 | ||||
| -rw-r--r-- | nova/tests/test_libvirt.py | 10 |
2 files changed, 6 insertions, 9 deletions
diff --git a/nova/image/fake.py b/nova/image/fake.py index 4bf25d9af..019d683f4 100644 --- a/nova/image/fake.py +++ b/nova/image/fake.py @@ -82,12 +82,9 @@ class _FakeImageService(service.BaseImageService): :raises: Duplicate if the image already exist. """ - #image_id = int(metadata['id']) - # metadata['id'] may not exists, and since image_id is - # randomly generated in local.py, let us do the same here try: image_id = int(metadata['id']) - except: + except KeyError: image_id = random.randint(0, 2 ** 31 - 1) if self.images.get(image_id): diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py index d9316ab4f..d008a149e 100644 --- a/nova/tests/test_libvirt.py +++ b/nova/tests/test_libvirt.py @@ -328,14 +328,14 @@ class LibvirtConnTestCase(test.TestCase): # To work with it from snapshot, the single image_service is needed recv_meta = image_service.create(context, sent_meta) - self.mox.StubOutWithMock(libvirt_conn.LibvirtConnection, '_conn') - libvirt_conn.LibvirtConnection._conn.lookupByName = fake_lookup - self.mox.StubOutWithMock(libvirt_conn.utils, 'execute') - libvirt_conn.utils.execute = fake_execute + self.mox.StubOutWithMock(connection.LibvirtConnection, '_conn') + connection.LibvirtConnection._conn.lookupByName = fake_lookup + self.mox.StubOutWithMock(connection.utils, 'execute') + connection.utils.execute = fake_execute self.mox.ReplayAll() - conn = libvirt_conn.LibvirtConnection(False) + conn = connection.LibvirtConnection(False) conn.snapshot(instance_ref, recv_meta['id']) snapshot = image_service.show(context, recv_meta['id']) |