diff options
| author | Brian Waldon <brian.waldon@rackspace.com> | 2011-11-03 10:55:28 -0400 |
|---|---|---|
| committer | Brian Lamar <brian.lamar@rackspace.com> | 2011-11-03 22:37:59 -0400 |
| commit | c3c53ba83abe3a23050eb3a2ffd665f6e24ab5aa (patch) | |
| tree | bdb70570cdd6b9054329e9c265e49cd23ae2380c | |
| parent | 7c5fa147eaf2133485255b0558afd4cd6ce42bc3 (diff) | |
| download | nova-c3c53ba83abe3a23050eb3a2ffd665f6e24ab5aa.tar.gz nova-c3c53ba83abe3a23050eb3a2ffd665f6e24ab5aa.tar.xz nova-c3c53ba83abe3a23050eb3a2ffd665f6e24ab5aa.zip | |
Correcting libvirt tests that were failing
Fixes bug 885037. With this merge prop we need to get libvirt tests
running in Jenkins.
Change-Id: I48e69f8ef3b70036f5d161c85b6c423344a695a2
| -rw-r--r-- | nova/tests/test_libvirt.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py index ac35c9498..0de8aff9e 100644 --- a/nova/tests/test_libvirt.py +++ b/nova/tests/test_libvirt.py @@ -248,7 +248,7 @@ class LibvirtConnTestCase(test.TestCase): 'vcpus': 2, 'project_id': 'fake', 'bridge': 'br101', - 'image_ref': '123456', + 'image_ref': '155d900f-4e14-4e4c-a73d-069cbf4541e6', 'local_gb': 20, 'instance_type_id': '5'} # m1.small @@ -361,10 +361,9 @@ class LibvirtConnTestCase(test.TestCase): # Start test image_service = utils.import_object(FLAGS.image_service) - # Assign image_ref = 3 from nova/images/fakes for testing - # ami image + # Assign different image_ref from nova/images/fakes for testing ami test_instance = copy.deepcopy(self.test_instance) - test_instance["image_ref"] = "3" + test_instance["image_ref"] = 'c905cedb-7281-47e4-8a62-f26bc5fc4c77' # Assuming that base image already exists in image_service instance_ref = db.instance_create(self.context, test_instance) @@ -475,10 +474,10 @@ class LibvirtConnTestCase(test.TestCase): # Start test image_service = utils.import_object(FLAGS.image_service) - # Assign image_ref = 2 from nova/images/fakes for testing different - # base image + # Assign different image_ref from nova/images/fakes for + # testing different base image test_instance = copy.deepcopy(self.test_instance) - test_instance["image_ref"] = "2" + test_instance["image_ref"] = '76fa36fc-c930-4bf3-8c8a-ea2a2420deb6' # Assuming that base image already exists in image_service instance_ref = db.instance_create(self.context, test_instance) |