diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-01-18 12:42:20 -0800 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-01-18 12:42:20 -0800 |
| commit | 6bef91e9fe67a893bd2a1ba0ef8ef56d4b2bb72d (patch) | |
| tree | 7f9a3b8d709e28da300bda70e9157b5adc90c4c3 | |
| parent | ef9b60f4b8d22f16c0606c5b3c2d2d40d76eac02 (diff) | |
| download | nova-6bef91e9fe67a893bd2a1ba0ef8ef56d4b2bb72d.tar.gz nova-6bef91e9fe67a893bd2a1ba0ef8ef56d4b2bb72d.tar.xz nova-6bef91e9fe67a893bd2a1ba0ef8ef56d4b2bb72d.zip | |
fix test to respect xml changes
| -rw-r--r-- | nova/tests/test_virt.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/nova/tests/test_virt.py b/nova/tests/test_virt.py index afdc89ba2..556fe561c 100644 --- a/nova/tests/test_virt.py +++ b/nova/tests/test_virt.py @@ -122,10 +122,10 @@ class LibvirtConnTestCase(test.TestCase): if rescue: check = (lambda t: t.find('./os/kernel').text.split('/')[1], - 'rescue-kernel') + 'kernel.rescue') check_list.append(check) check = (lambda t: t.find('./os/initrd').text.split('/')[1], - 'rescue-ramdisk') + 'ramdisk.rescue') check_list.append(check) else: if expect_kernel: @@ -161,13 +161,16 @@ class LibvirtConnTestCase(test.TestCase): if rescue: common_checks += [ (lambda t: t.findall('./devices/disk/source')[0].get( - 'file').split('/')[1], 'rescue-disk'), + 'file').split('/')[1], 'disk.rescue'), (lambda t: t.findall('./devices/disk/source')[1].get( 'file').split('/')[1], 'disk')] else: common_checks += [(lambda t: t.findall( './devices/disk/source')[0].get('file').split('/')[1], 'disk')] + common_checks += [(lambda t: t.findall( + './devices/disk/source')[1].get('file').split('/')[1], + 'disk.local')] for (libvirt_type, (expected_uri, checks)) in type_uri_map.iteritems(): FLAGS.libvirt_type = libvirt_type |