NuKVM/virt-manager
3
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-02-25 18:55:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

virtconvtest: Fix vmx2libvirt test

Browse Source 
The test consists of translating VMX configuration into domain
XML and converting disks. Cool. But the disk is zipped in a file
and the test tries to string match unzipping command. Problem is,
the absolute path is passed to the unzip command which makes it
impossible for the test to succeed on other hosts.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>

(crobinso: fix whitespace)
This commit is contained in:
Michal Privoznik 2016-01-15 08:27:45 +01:00 committed by Cole Robinson
parent 58ac786b6b
commit ee5da7d02b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/virtconv-files/libvirt_output/vmx2libvirt_test-vmx-zip.libvirt
View File

@ -73,5 +73,5 @@
</domain>
test-vmx-zip.zip appears to be an archive, running: unzip -o -d /var/tmp/virt-convert-tmp /home/crobinso/src/virt-manager/tests/virtconv-files/vmx_input/test-vmx-zip.zip
test-vmx-zip.zip appears to be an archive, running: unzip -o -d /var/tmp/virt-convert-tmp vmx_input/test-vmx-zip.zip
Copying MS-DOS.vmdk to /var/lib/libvirt/images/MS-DOS

2
tests/virtconvtest.py
View File

@ -49,7 +49,7 @@ class TestVirtConv(unittest.TestCase):
ignore, out_xml = guest.start_install(return_xml=True)
out_expect = out_xml
if outbuf.getvalue():
out_expect += ("\n\n" + outbuf.getvalue())
out_expect += ("\n\n" + outbuf.getvalue().replace(base_dir, ""))
if not conn.check_support(conn.SUPPORT_CONN_VMPORT):
self.skipTest("Not comparing XML because vmport isn't supported")