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

tests: Fix test suite failures on f29 libvirt 4.7.0

This commit is contained in:
Cole Robinson 2019-05-16 11:29:12 -04:00
parent 6394ab7f9a
commit 4e3e38cad1
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/cli-test-xml/compare/virt-install-singleton-config-2.xml
View File

@ -32,9 +32,9 @@
<page size="1234" unit="MB" nodeset="2"/>
</hugepages>
<access mode="shared"/>
<source type="anonymous"/>
<source type="file"/>
<discard/>
<allocation mode="ondemand"/>
<allocation mode="immediate"/>
</memoryBacking>
<vcpu>9</vcpu>
<numatune>
@ -242,9 +242,9 @@
<page size="1234" unit="MB" nodeset="2"/>
</hugepages>
<access mode="shared"/>
<source type="anonymous"/>
<source type="file"/>
<discard/>
<allocation mode="ondemand"/>
<allocation mode="immediate"/>
</memoryBacking>
<vcpu>9</vcpu>
<numatune>

4
tests/clitest.py
View File

@ -462,7 +462,7 @@ cache.mode=emulate,cache.level=3
--numatune 1-3,4,mode=strict
--memtune hard_limit=10,soft_limit=20,swap_hard_limit=30,min_guarantee=40
--blkiotune weight=100,device_path=/home/test/1.img,device_weight=200
--memorybacking size=1,unit='G',nodeset=0,1,nosharepages=yes,locked=yes,discard=yes,allocation.mode=ondemand,access_mode=shared,source_type=anonymous,hugepages.page.size=12,hugepages.page1.size=1234,hugepages.page1.unit=MB,hugepages.page1.nodeset=2
--memorybacking size=1,unit='G',nodeset=0,1,nosharepages=yes,locked=yes,discard=yes,allocation.mode=immediate,access_mode=shared,source_type=file,hugepages.page.size=12,hugepages.page1.size=1234,hugepages.page1.unit=MB,hugepages.page1.nodeset=2
--features acpi=off,eoi=on,privnet=on,hyperv_synic=on,hyperv_reset=on,hyperv_spinlocks=on,hyperv_spinlocks_retries=5678,vmport=off,pmu=off,vmcoreinfo=on,kvm_hidden=off,hyperv_vapic=on
--clock offset=utc,hpet_present=no,rtc_tickpolicy=merge,timer2.name=hypervclock,timer3.name=pit,timer1.present=yes,timer3.tickpolicy=delay,timer2.present=no
--sysinfo type=smbios,bios_vendor="Acme LLC",bios_version=1.2.3,bios_date=01/01/1970,bios_release=10.22
@ -662,7 +662,7 @@ c.add_compare("--cpuset auto --vcpus 2", "cpuset-auto") # --cpuset=auto actuall
c.add_compare("--memory hotplugmemorymax=2048,hotplugmemoryslots=2 --cpu cell0.cpus=0,cell0.memory=1048576 --memdev dimm,access=private,target_size=512,target_node=0,source_pagesize=4,source_nodemask=1-2 --memdev nvdimm,source_path=/path/to/nvdimm,target_size=512,target_node=0,target_label_size=128,alias.name=mymemdev3", "memory-hotplug", check_version="5.3.0")
c.add_compare("--memory currentMemory=100,memory=200,maxmemory=300,maxMemory=400,maxMemory.slots=1", "memory-option-backcompat", check_version="5.3.0")
c.add_compare("--connect " + utils.URIs.kvm_q35 + " --cpu qemu64,secure=off", "cpu-disable-sec") # disable security features that are added by default
c.add_compare("--connect " + utils.URIs.kvm_rhel, "cpu-rhel7-default") # default CPU for old QEMU where we cannot use host-model
c.add_compare("--connect " + utils.URIs.kvm_rhel, "cpu-rhel7-default", check_version="5.1.0") # default CPU for old QEMU where we cannot use host-model

2
virtinst/osdict.py
View File

@ -523,7 +523,7 @@ class _OsVariant(object):
def get_network_install_resources(self, guest):
ret = {}
if not self._os:
if not hasattr(self._os, "get_network_install_resources"):
return ret
resources = self._os.get_network_install_resources()