mirror of
https://github.com/virt-manager/virt-manager.git
synced 2024-10-27 01:55:20 +03:00
Fix USB test failures with latest libvirt
This commit is contained in:
parent
3889bc480b
commit
0283750b9d
@ -520,7 +520,7 @@ vinst.add_invalid("char", "--console pty,target_type=abcd") # --console unknown
|
||||
vinst.add_category("controller", "--noautoconsole --nodisks --pxe")
|
||||
vinst.add_valid("controller", "--controller usb,model=ich9-ehci1,address=0:0:4.7")
|
||||
vinst.add_valid("controller", "--controller usb,model=ich9-ehci1,address=0:0:4.7,index=0")
|
||||
vinst.add_valid("controller", "--controller usb,model=ich9-ehci1,address=0:0:4.7,index=1,master=0")
|
||||
vinst.add_valid("controller", "--controller usb,model=ich9-ehci1,address=0:0:4.7,index=1")
|
||||
vinst.add_valid("controller", "--controller usb2")
|
||||
vinst.add_invalid("controller", "--controller") # Missing argument
|
||||
vinst.add_invalid("controller", "--controller foo") # Invalid argument
|
||||
|
@ -124,10 +124,10 @@ def sanitize_xml_for_define(xml):
|
||||
def test_create(testconn, xml):
|
||||
xml = sanitize_xml_for_define(xml)
|
||||
|
||||
# try:
|
||||
dom = testconn.defineXML(xml)
|
||||
# except Exception, e:
|
||||
# raise RuntimeError(str(e) + "\n" + xml)
|
||||
try:
|
||||
dom = testconn.defineXML(xml)
|
||||
except Exception, e:
|
||||
raise RuntimeError(str(e) + "\n" + xml)
|
||||
|
||||
try:
|
||||
dom.create()
|
||||
|
@ -22,7 +22,7 @@
|
||||
<controller type="ide" index="3"/>
|
||||
<controller type="virtio-serial" index="0" ports="32" vectors="17"/>
|
||||
<controller type="scsi" index="1"/>
|
||||
<controller type='usb' index='3' model='ich9-uhci3'>
|
||||
<controller type='usb' index='3' model='ich9-ehci1'>
|
||||
<master startport='4'/>
|
||||
<address type='pci' domain='0' bus='0' slot='4' function='2'/>
|
||||
</controller>
|
||||
|
@ -22,8 +22,7 @@
|
||||
<controller type="ide" index="1"/>
|
||||
<controller type="virtio-serial" index="7" ports="5"/>
|
||||
<controller type="scsi" index="2"/>
|
||||
<controller type="usb" index="9" model="ich9-uhci3">
|
||||
<master startport="2"/>
|
||||
<controller type="usb" index="9" model="ich9-ehci1">
|
||||
<address type="pci" domain="0" bus="0" slot="4" function="2"/>
|
||||
</controller>
|
||||
</devices>
|
||||
|
@ -18,7 +18,6 @@
|
||||
<devices>
|
||||
<emulator>/usr/local/bin/qemu-kvm</emulator>
|
||||
<controller type="usb" index="1" model="ich9-ehci1">
|
||||
<master startport="0"/>
|
||||
<address type="pci" domain="0" bus="0" slot="4" function="7"/>
|
||||
</controller>
|
||||
<interface type="user">
|
||||
|
@ -18,7 +18,6 @@
|
||||
<devices>
|
||||
<emulator>/usr/local/bin/qemu-kvm</emulator>
|
||||
<controller type="usb" index="1" model="ich9-ehci1">
|
||||
<master startport="0"/>
|
||||
<address type="pci" domain="0" bus="0" slot="4" function="7"/>
|
||||
</controller>
|
||||
<interface type="user">
|
||||
|
@ -41,8 +41,8 @@ class XMLParseTest(unittest.TestCase):
|
||||
utils.diff_compare(actualXML, expect_out=expectXML)
|
||||
|
||||
def _alter_compare(self, actualXML, outfile):
|
||||
utils.test_create(conn, actualXML)
|
||||
utils.diff_compare(actualXML, outfile)
|
||||
utils.test_create(conn, actualXML)
|
||||
|
||||
def testRoundTrip(self):
|
||||
"""
|
||||
@ -383,10 +383,10 @@ class XMLParseTest(unittest.TestCase):
|
||||
check = self._make_checker(dev4)
|
||||
check("type", "usb")
|
||||
check("index", "3", "9")
|
||||
check("model", "ich9-uhci3")
|
||||
check("model", "ich9-ehci1")
|
||||
|
||||
check = self._make_checker(dev4.get_master())
|
||||
check("startport", "4", "2")
|
||||
check("startport", "4", "2", None)
|
||||
|
||||
self._alter_compare(guest.get_xml_config(), outfile)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user