diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-20 01:10:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-20 01:10:15 +0000 |
| commit | 4c3ce791de81438844967e65b168bb773376e159 (patch) | |
| tree | e3a20fa9e4bd030e61d0d8efdffd7c72d67016c7 | |
| parent | dd28988b57fd6934f3b84173e02b2a53b1ce5fbc (diff) | |
| parent | 275ab1227e3ab0446c7a527c9499b458e72e38b7 (diff) | |
Merge "Restore self.test_instance at LibvirtConnTestCase.setUp()"
| -rw-r--r-- | nova/tests/test_libvirt.py | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py index b2bc88780..2e8219fe7 100644 --- a/nova/tests/test_libvirt.py +++ b/nova/tests/test_libvirt.py @@ -564,23 +564,23 @@ class LibvirtConnTestCase(test.TestCase): self.stubs.Set(libvirt_driver.disk, 'extend', fake_extend) nova.tests.image.fake.stub_out_image_service(self.stubs) + self.test_instance = { + 'memory_kb': '1024000', + 'basepath': '/some/path', + 'bridge_name': 'br100', + 'vcpus': 2, + 'project_id': 'fake', + 'bridge': 'br101', + 'image_ref': '155d900f-4e14-4e4c-a73d-069cbf4541e6', + 'root_gb': 10, + 'ephemeral_gb': 20, + 'instance_type_id': '5'} # m1.small def tearDown(self): libvirt_driver.libvirt_utils = libvirt_utils nova.tests.image.fake.FakeImageService_reset() super(LibvirtConnTestCase, self).tearDown() - test_instance = {'memory_kb': '1024000', - 'basepath': '/some/path', - 'bridge_name': 'br100', - 'vcpus': 2, - 'project_id': 'fake', - 'bridge': 'br101', - 'image_ref': '155d900f-4e14-4e4c-a73d-069cbf4541e6', - 'root_gb': 10, - 'ephemeral_gb': 20, - 'instance_type_id': '5'} # m1.small - def create_fake_libvirt_mock(self, **kwargs): """Defining mocks for LibvirtDriver(libvirt is not used).""" @@ -2161,7 +2161,7 @@ class LibvirtConnTestCase(test.TestCase): imagebackend.Image.cache(context=mox.IgnoreArg(), fetch_func=mox.IgnoreArg(), filename='otherdisk', - image_id=123456, + image_id=self.test_instance['image_ref'], project_id='fake', size=10737418240L, user_id=None).AndReturn(None) |