Subject: tests: Fix host-copy XML with libvirt 10.1.0
From: Cole Robinson crobinso@redhat.com Sat Apr 6 15:48:46 2024 -0400
Date: Sat Apr 6 15:48:46 2024 -0400:
Git: 8b6db203f726965529567459b302aab1c68c70eb

New `clusters` changes XML output

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

--- a/tests/data/cli/compare/virt-xml-edit-cpu-host-copy.xml
+++ b/tests/data/cli/compare/virt-xml-edit-cpu-host-copy.xml
@@ -5,7 +5,7 @@
 -  <cpu mode="custom" match="exact">
 -    <model fallback="allow">core2duo</model>
 -    <vendor>Intel</vendor>
--    <topology sockets="9" dies="1" cores="1" threads="1"/>
+-    <topology sockets="9" dies="1" clusters="1" cores="1" threads="1"/>
 -    <feature policy="require" name="pbe"/>
 -    <feature policy="require" name="tm2"/>
 -    <feature policy="require" name="est"/>
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -1357,7 +1357,7 @@ c.add_compare("--confirm 1 --edit --cpu
 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 --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("--print-diff --define --connect %(URI-KVM-X86)s test-many-devices --edit --cpu host-copy", "edit-cpu-host-copy", precompare_check="10.1.0")
 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
 c.add_compare("test --add-device --network default --update --confirm --no-define", "update-nodefine-succeed", env={"VIRTXML_TESTSUITE_UPDATE_IGNORE_FAIL": "1"}, input_text="yes\n")  # test hotplug success without define