shaba/virt-manager
1
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2024-12-24 21:34:47 +03:00
Code Issues Projects Releases Wiki Activity

tests: Adapt for new video primary= output in libvirt 1.3.3

Browse Source
This commit is contained in:
Cole Robinson 2016-04-09 09:17:01 -04:00
parent b11c9c5cc6
commit e669e67b40
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/cli-test-xml/compare/virt-xml-edit-neg-num.xml
View File

@ -1,4 +1,4 @@
<model type="vmvga" vram="16384" heads="1"/>
<model type="vmvga" vram="16384" heads="1" primary="yes"/>
</video>
<video>
- <model type="cirrus" vram="16384" heads="3"/>

2
tests/cli-test-xml/compare/virt-xml-edit-pos-num.xml
View File

@ -4,7 +4,7 @@
- <sound model="ich6"/>
+ <sound model="pcspk"/>
<video>
<model type="vmvga" vram="16384" heads="1"/>
<model type="vmvga" vram="16384" heads="1" primary="yes"/>
</video>
Domain 'test-for-virtxml' defined successfully.

2
tests/cli-test-xml/compare/virt-xml-edit-select-sound-model.xml
View File

@ -4,7 +4,7 @@
- <sound model="ich6"/>
+ <sound model="pcspk"/>
<video>
<model type="vmvga" vram="16384" heads="1"/>
<model type="vmvga" vram="16384" heads="1" primary="yes"/>
</video>
Domain 'test-for-virtxml' defined successfully.

4
tests/cli-test-xml/compare/virt-xml-edit-simple-video.xml
View File

@ -1,8 +1,8 @@
<sound model="es1370"/>
<sound model="ich6"/>
<video>
- <model type="vmvga" vram="16384" heads="1"/>
+ <model type="cirrus" vram="16384" heads="1"/>
- <model type="vmvga" vram="16384" heads="1" primary="yes"/>
+ <model type="cirrus" vram="16384" heads="1" primary="yes"/>
</video>
<video>
<model type="cirrus" vram="16384" heads="3"/>

2
tests/cli-test-xml/compare/virt-xml-remove-sound-model.xml
View File

@ -3,7 +3,7 @@
<sound model="es1370"/>
- <sound model="ich6"/>
<video>
<model type="vmvga" vram="16384" heads="1"/>
<model type="vmvga" vram="16384" heads="1" primary="yes"/>
</video>
Domain 'test-for-virtxml' defined successfully.

2
tests/cli-test-xml/compare/virt-xml-remove-video-all.xml
View File

@ -2,7 +2,7 @@
<sound model="es1370"/>
<sound model="ich6"/>
- <video>
- <model type="vmvga" vram="16384" heads="1"/>
- <model type="vmvga" vram="16384" heads="1" primary="yes"/>
- </video>
- <video>
- <model type="cirrus" vram="16384" heads="3"/>

10
tests/clitest.py
View File

@ -850,16 +850,16 @@ c.add_compare("--parallel unix,path=/some/other/log", "edit-simple-parallel")
c.add_compare("--channel null", "edit-simple-channel")
c.add_compare("--console name=foo.bar.baz", "edit-simple-console")
c.add_compare("--filesystem /1/2/3,/4/5/6,mode=mapped", "edit-simple-filesystem")
c.add_compare("--video cirrus", "edit-simple-video", compare_check=support.SUPPORT_CONN_VIDEO_NEW_RAM_OUTPUT)
c.add_compare("--video cirrus", "edit-simple-video", compare_check="1.3.3") # compare_check=video primary= attribute
c.add_compare("--sound pcspk", "edit-simple-soundhw", compare_check="1.3.2") # compare_check=<input> reordering
c.add_compare("--host-device 0x0781:0x5151,driver_name=vfio", "edit-simple-host-device")
c = vixml.add_category("edit selection", "test-for-virtxml --print-diff --define", compare_check=support.SUPPORT_CONN_INPUT_KEYBOARD)
c.add_invalid("--edit target=vvv --disk /dev/null") # no match found
c.add_compare("--edit 3 --sound pcspk", "edit-pos-num", compare_check=support.SUPPORT_CONN_VIDEO_NEW_RAM_OUTPUT)
c.add_compare("--edit 3 --sound pcspk", "edit-pos-num", compare_check="1.3.3") # compare_check=video primary= attribute
c.add_compare("--edit -1 --video qxl", "edit-neg-num", compare_check=support.SUPPORT_CONN_VIDEO_NEW_RAM_OUTPUT)
c.add_compare("--edit all --host-device driver_name=vfio", "edit-all")
c.add_compare("--edit ich6 --sound pcspk", "edit-select-sound-model", compare_check=support.SUPPORT_CONN_VIDEO_NEW_RAM_OUTPUT)
c.add_compare("--edit ich6 --sound pcspk", "edit-select-sound-model", compare_check="1.3.3") # compare_check=video primary= attribute
c.add_compare("--edit target=hda --disk /dev/null", "edit-select-disk-target")
c.add_compare("--edit /tmp/foobar2 --disk shareable=off,readonly=on", "edit-select-disk-path")
c.add_compare("--edit mac=00:11:7f:33:44:55 --network target=nic55", "edit-select-network-mac")
@ -879,10 +879,10 @@ 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
c.add_compare("--add-device --disk %(NEWIMG1)s,size=.01", "add-disk-create-storage")
c.add_compare("--remove-device --sound ich6", "remove-sound-model", compare_check=support.SUPPORT_CONN_VIDEO_NEW_RAM_OUTPUT)
c.add_compare("--remove-device --sound ich6", "remove-sound-model", compare_check="1.3.3") # compare_check=video primary= attribute
c.add_compare("--remove-device --disk 3", "remove-disk-index")
c.add_compare("--remove-device --disk /dev/null", "remove-disk-path")
c.add_compare("--remove-device --video all", "remove-video-all", compare_check=support.SUPPORT_CONN_VIDEO_NEW_RAM_OUTPUT)
c.add_compare("--remove-device --video all", "remove-video-all", compare_check="1.3.3") # compare_check=video primary= attribute
c.add_compare("--remove-device --host-device 0x04b3:0x4485", "remove-hostdev-name", compare_check=support.SUPPORT_CONN_VIDEO_NEW_RAM_OUTPUT)