From 061224892c35eb58b8057cb91ea852940afce7ee Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Wed, 22 Jun 2022 13:07:53 +0200 Subject: [PATCH] qemuxml2argvtest: Make 'qemu-ns' test case more stable MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The test was showing that the 'blockdev' capability is properly added although we didn't detect it yet. Unfortunately this test can't be carried over once we bump minimum qemu version to qemu-4.2. Make the test case future-proof by removing the qemu-4.0.0 version which would become pointless and use only already deprecated capability flags so that the test output does not change. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- .../qemu-ns.x86_64-4.0.0.args | 38 ------------------- tests/qemuxml2argvdata/qemu-ns.xml | 1 - tests/qemuxml2argvtest.c | 1 - .../qemu-ns.x86_64-latest.xml | 1 - 4 files changed, 41 deletions(-) delete mode 100644 tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args diff --git a/tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args b/tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args deleted file mode 100644 index 284f32d6a1..0000000000 --- a/tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args +++ /dev/null @@ -1,38 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/tmp/lib/domain--1-QEMUGuest1 \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -QEMU_AUDIO_DRV=none \ -NS=ns \ -BAR='' \ -/usr/bin/qemu-system-x86_64 \ --name guest=QEMUGuest1,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.0,usb=off,dump-guest-core=off \ --accel tcg \ --m 214 \ --overcommit mem-lock=off \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot strict=on \ --device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ua-disk,bootindex=1,prop1=propval1,prop2=-321,prop3=123,prop4=on,prop5=off \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ --unknown parameter \ --sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/qemu-ns.xml b/tests/qemuxml2argvdata/qemu-ns.xml index 36bf582dec..dc98421226 100644 --- a/tests/qemuxml2argvdata/qemu-ns.xml +++ b/tests/qemuxml2argvdata/qemu-ns.xml @@ -30,7 +30,6 @@ - diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 324475475e..e14ed8b882 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2036,7 +2036,6 @@ mymain(void) QEMU_CAPS_LAST, ARG_END); - DO_TEST_CAPS_VER("qemu-ns", "4.0.0"); DO_TEST_CAPS_LATEST("qemu-ns"); DO_TEST_NOCAPS("qemu-ns-no-env"); DO_TEST_NOCAPS("qemu-ns-alt"); diff --git a/tests/qemuxml2xmloutdata/qemu-ns.x86_64-latest.xml b/tests/qemuxml2xmloutdata/qemu-ns.x86_64-latest.xml index a8998ae582..b788038f29 100644 --- a/tests/qemuxml2xmloutdata/qemu-ns.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/qemu-ns.x86_64-latest.xml @@ -46,7 +46,6 @@ - -- 2.39.5