shaba/virt-manager
1
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-01-10 01:18:03 +03:00
Code Issues Projects Releases Wiki Activity

tests: use different USB device when testing hot-add

Browse Source 
Libvirt now validates that all <hostdev> elements refer to distinct host
devices. The test suite violates that constraint by trying to hot-add a
device that alreadye exists in the config.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2021-10-29 12:04:49 +01:00 committed by Daniel Berrangé
parent 67695d00cf
commit cfa88603a2
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/data/cli/compare/virt-xml-add-host-device.xml
View File

@ -3,8 +3,8 @@
</vsock>
+ <hostdev mode="subsystem" type="usb" managed="yes">
+ <source>
+ <vendor id="0x04b3"/>
+ <product id="0x4485"/>
+ <vendor id="0x0483"/>
+ <product id="0x2016"/>
+ </source>
+ </hostdev>
</devices>
@ -12,4 +12,4 @@
<keywrap>
Domain 'test-for-virtxml' defined successfully.
Changes will take effect after the domain is fully powered off.
Changes will take effect after the domain is fully powered off.

14
tests/data/testdriver/testsuite.xml
View File

@ -743,6 +743,20 @@
</capability>
</device>
<device>
<name>usb_device_483_2016_noserial</name>
<parent>usb_device_1d6b_1_0000_00_1a_0</parent>
<driver>
<name>usb</name>
</driver>
<capability type='usb_device'>
<bus>3</bus>
<device>2</device>
<product id='0x2016'>Fingerprint Reader</product>
<vendor id='0x0483'>SGS Thomson Microelectronics</vendor>
</capability>
</device>
<device>
<name>mdev_8e37ee90_2b51_45e3_9b25_bf8283c03110</name>
<path>/sys/devices/css0/0.0.0023/8e37ee90-2b51-45e3-9b25-bf8283c03110</path>

2
tests/test_cli.py
View File

@ -1350,7 +1350,7 @@ c = vixml.add_category("add/rm devices", "test-for-virtxml --print-diff --define
c.add_valid("--add-device --security model=dac") # --add-device works for seclabel
c.add_invalid("--add-device --pm suspend_to_disk=yes") # --add-device without a device
c.add_invalid("--remove-device --clock utc") # --remove-device without a dev
c.add_compare("--add-device --host-device usb_device_4b3_4485_noserial", "add-host-device")
c.add_compare("--add-device --host-device usb_device_483_2016_noserial", "add-host-device")
c.add_compare("--add-device --sound pcspk", "add-sound")
c.add_compare("--add-device --disk %(EXISTIMG1)s,bus=virtio,target=vdf", "add-disk-basic")
c.add_compare("--add-device --disk %(EXISTIMG1)s", "add-disk-notarget") # filling in acceptable target