tests: Fix with latest libvirt

Signed-off-by: Cole Robinson <crobinso@redhat.com>

4 files changed, 12 insertions, 9 deletions

diff --git a/tests/data/cli/compare/virt-install-many-devices.xml b/tests/data/cli/compare/virt-install-many-devices.xml
index a884547b..8198c2d1 100644
--- a/tests/data/cli/compare/virt-install-many-devices.xml
+++ b/tests/data/cli/compare/virt-install-many-devices.xml
@@ -105,7 +105,6 @@
       <feature enabled="yes" name="secure-boot"/>
       <feature enabled="no" name="enrolled-keys"/>
     </firmware>
-    <loader readonly="yes" secure="no" type="rom">/tmp/foo</loader>
     <initarg>foo=bar</initarg>
     <initarg>baz=woo</initarg>
     <initenv name="MYENV">some value</initenv>
diff --git a/tests/data/cli/compare/virt-install-singleton-config-2.xml b/tests/data/cli/compare/virt-install-singleton-config-2.xml
index d82dddb3..d567d188 100644
--- a/tests/data/cli/compare/virt-install-singleton-config-2.xml
+++ b/tests/data/cli/compare/virt-install-singleton-config-2.xml
@@ -11,6 +11,7 @@
   <vcpu cpuset="1,3-5">2</vcpu>
   <os>
     <type arch="x86_64" machine="q35">hvm</type>
+    <loader readonly="yes" secure="no" type="rom">/tmp/foo</loader>
     <smbios mode="emulate"/>
     <boot dev="network"/>
     <boot dev="hd"/>
@@ -111,6 +112,7 @@
   <vcpu cpuset="1,3-5">2</vcpu>
   <os>
     <type arch="x86_64" machine="q35">hvm</type>
+    <loader readonly="yes" secure="no" type="rom">/tmp/foo</loader>
     <boot dev="hd"/>
     <smbios mode="emulate"/>
   </os>
diff --git a/tests/data/cli/compare/virt-xml-edit-boot-uefi.xml b/tests/data/cli/compare/virt-xml-edit-boot-uefi.xml
index 792de9be..4345b385 100644
--- a/tests/data/cli/compare/virt-xml-edit-boot-uefi.xml
+++ b/tests/data/cli/compare/virt-xml-edit-boot-uefi.xml
@@ -1,11 +1,11 @@
-       <entry name="location">Upside down</entry>
-     </baseBoard>
-   </sysinfo>
+   <memory unit="KiB">8388608</memory>
+   <currentMemory unit="KiB">2097152</currentMemory>
+   <vcpu placement="static">2</vcpu>
 -  <os>
 +  <os firmware="efi">
      <type arch="i686">hvm</type>
-     <loader readonly="yes" type="pflash">/usr/share/edk2/ovmf/OVMF_CODE.fd</loader>
-     <nvram>/nvram/test-many-devices_VARS.fd</nvram>
+     <boot dev="hd"/>
+   </os>
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test' defined successfully.
 Changes will take effect after the domain is fully powered off.
diff --git a/tests/test_cli.py b/tests/test_cli.py
index 715fc503..7d73f7a6 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -487,7 +487,6 @@ emulator=/new/emu,bootloader=/new/bootld,bootloader_args='--append single',reboo
 initargs="foo=bar baz=woo",initdir=/my/custom/cwd,inituser=tester,initgroup=1000,\
 bios.useserial=no,bios.rebootTimeout=60,cmdline=root=/foo,\
 bootmenu.enable=yes,bootmenu.timeout=5000,\
-loader_ro=yes,loader.type=rom,loader=/tmp/foo,loader_secure=no,\
 acpi.table=/path/to/slic.dat,acpi.table.type=slic,\
 initenv0.name=MYENV,initenv0='some value',initenv1.name=FOO,initenv1=bar,\
 initdir=/my/custom/cwd,inituser=tester,initgroup=1000
@@ -833,6 +832,9 @@ c.add_compare("--pxe "
 "--seclabel type=dynamic "  # test a fallback case when guessing model=
 "--sysinfo emulate "  # special `--sysinfo emulate` handling
 "--cpuset 1,3-5 "  # setting compat --cpuset when --vcpus is not present
+# --boot loader settings here, or they will conflict with firmware=efi
+# in other test cases
+"--boot loader_ro=yes,loader.type=rom,loader=/tmp/foo,loader_secure=no "
 
 # 'default' handling for solo devices
 """
@@ -1345,7 +1347,7 @@ c.add_compare("4a64cc71-19c4-2fd0-2323-3050941ea3c3 --edit --boot network,cdrom"
 c.add_compare("--confirm 1 --edit --cpu host-passthrough", "prompt-response", input_text="yes")  # prompt response, also using domid lookup
 c.add_compare("--edit --print-diff --qemu-commandline clearxml=yes", "edit-clearxml-qemu-commandline", input_file=(_VIRTXMLDIR + "virtxml-qemu-commandline-clear.xml"))
 c.add_compare("--print-diff --remove-device --serial 1", "remove-console-dup", input_file=(_VIRTXMLDIR + "virtxml-console-dup.xml"))
-c.add_compare("--print-diff --define --connect %(URI-KVM-X86)s test-many-devices --edit --boot uefi", "edit-boot-uefi")
+c.add_compare("--print-diff --define --connect %(URI-KVM-X86)s test --edit --boot uefi", "edit-boot-uefi")
 c.add_compare("--print-diff --define --connect %(URI-KVM-X86)s test-many-devices --edit --cpu host-copy", "edit-cpu-host-copy")
 c.add_compare("--connect %(URI-KVM-X86)s test-many-devices --build-xml --disk source.pool=pool-disk,source.volume=sdfg1", "build-pool-logical-disk")
 c.add_compare("test --add-device --network default --update --confirm", "update-succeed", env={"VIRTXML_TESTSUITE_UPDATE_IGNORE_FAIL": "1", "VIRTINST_TEST_SUITE_INCREMENT_MACADDR": "1"}, input_text="yes\nyes\n")  # test hotplug success