openkylin
/
virt-manager
mirror of https://gitee.com/openkylin/virt-manager.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

tests: Regenerate with osinfo-db git

This commit is contained in:
Cole Robinson 2018-10-13 16:33:37 -04:00
parent f102d2a256
commit 2ba48539ea
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/cli-test-xml/compare/virt-install-kvm-centos7.xml
View File

@ -10,7 +10,7 @@
<currentMemory>65536</currentMemory> <currentMemory>65536</currentMemory>
<vcpu>1</vcpu> <vcpu>1</vcpu>
<os> <os>
<type arch="x86_64" machine="pc">hvm</type> <type arch="x86_64" machine="q35">hvm</type>
<boot dev="network"/> <boot dev="network"/>
<boot dev="hd"/> <boot dev="hd"/>
</os> </os>
@ -55,7 +55,7 @@
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes"> <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/> <image compression="off"/>
</graphics> </graphics>
<sound model="ich6"/> <sound model="ich9"/>
<video> <video>
<model type="qxl"/> <model type="qxl"/>
</video> </video>
@ -78,7 +78,7 @@
<currentMemory>65536</currentMemory> <currentMemory>65536</currentMemory>
<vcpu>1</vcpu> <vcpu>1</vcpu>
<os> <os>
<type arch="x86_64" machine="pc">hvm</type> <type arch="x86_64" machine="q35">hvm</type>
<boot dev="hd"/> <boot dev="hd"/>
</os> </os>
<features> <features>
@ -121,7 +121,7 @@
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes"> <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/> <image compression="off"/>
</graphics> </graphics>
<sound model="ich6"/> <sound model="ich9"/>
<video> <video>
<model type="qxl"/> <model type="qxl"/>
</video> </video>

2
tests/utils.py
View File

@ -32,7 +32,7 @@ clistate = _CLIState()
def has_old_osinfo(): def has_old_osinfo():
# Some tests rely on newer osinfo data. Check for a new condition # Some tests rely on newer osinfo data. Check for a new condition
# here, and older tests will be skipped # here, and older tests will be skipped
osname = "win7" osname = "centos7.0"
if not virtinst.OSDB.lookup_os(osname): if not virtinst.OSDB.lookup_os(osname):
return True return True
return not virtinst.OSDB.lookup_os(osname).supports_chipset_q35() return not virtinst.OSDB.lookup_os(osname).supports_chipset_q35()