[PATCH 11/14] qemuxml2argvtest: Add DO_TEST_CAPS_LATEST for the vnc unix socket tests
Peter Krempa
pkrempa at redhat.com
Thu Sep 23 15:37:17 UTC 2021
Now that the code is refactored add the DO_TEST_CAPS_LATEST versions as
promised in the commit adding the pinned versions.
Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
...ics-vnc-auto-socket-cfg.x86_64-latest.args | 36 +++++++++++++++++++
...raphics-vnc-auto-socket.x86_64-latest.args | 33 +++++++++++++++++
.../graphics-vnc-socket.x86_64-latest.args | 33 +++++++++++++++++
tests/qemuxml2argvtest.c | 3 ++
4 files changed, 105 insertions(+)
create mode 100644 tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.x86_64-latest.args
create mode 100644 tests/qemuxml2argvdata/graphics-vnc-auto-socket.x86_64-latest.args
create mode 100644 tests/qemuxml2argvdata/graphics-vnc-socket.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.x86_64-latest.args
new file mode 100644
index 0000000000..5fa93dc611
--- /dev/null
+++ b/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.x86_64-latest.args
@@ -0,0 +1,36 @@
+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 \
+/usr/bin/qemu-system-i386 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
+-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-cpu qemu64 \
+-m 214 \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-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=ide0-0-0,bootindex=1 \
+-audiodev id=audio1,driver=none \
+-vnc vnc=unix:/tmp/lib/domain--1-QEMUGuest1/vnc.sock,audiodev=audio1 \
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/graphics-vnc-auto-socket.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-vnc-auto-socket.x86_64-latest.args
new file mode 100644
index 0000000000..c2ea5ca77c
--- /dev/null
+++ b/tests/qemuxml2argvdata/graphics-vnc-auto-socket.x86_64-latest.args
@@ -0,0 +1,33 @@
+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 \
+/usr/bin/qemu-system-i386 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
+-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-cpu qemu64 \
+-m 214 \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-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 \
+-audiodev id=audio1,driver=none \
+-vnc vnc=unix:/tmp/lib/domain--1-QEMUGuest1/vnc.sock,audiodev=audio1 \
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/graphics-vnc-socket.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-vnc-socket.x86_64-latest.args
new file mode 100644
index 0000000000..af595caf10
--- /dev/null
+++ b/tests/qemuxml2argvdata/graphics-vnc-socket.x86_64-latest.args
@@ -0,0 +1,33 @@
+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 \
+/usr/bin/qemu-system-i386 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
+-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-cpu qemu64 \
+-m 214 \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-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 \
+-audiodev id=audio1,driver=none \
+-vnc vnc=unix:/tmp/vnc.sock,audiodev=audio1 \
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index cda73d9f88..fdd38ee1a1 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1455,6 +1455,7 @@ mymain(void)
* they can be removed without replacement when "2.11.0" will be retired */
DO_TEST("graphics-vnc", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA);
DO_TEST_CAPS_VER("graphics-vnc-socket", "2.11.0");
+ DO_TEST_CAPS_LATEST("graphics-vnc-socket");
DO_TEST("graphics-vnc-websocket",
QEMU_CAPS_VNC,
QEMU_CAPS_DEVICE_CIRRUS_VGA);
@@ -1467,8 +1468,10 @@ mymain(void)
QEMU_CAPS_DEVICE_CIRRUS_VGA);
driver.config->vncAutoUnixSocket = true;
DO_TEST_CAPS_VER("graphics-vnc-auto-socket-cfg", "2.11.0");
+ DO_TEST_CAPS_LATEST("graphics-vnc-auto-socket-cfg");
driver.config->vncAutoUnixSocket = false;
DO_TEST_CAPS_VER("graphics-vnc-auto-socket", "2.11.0");
+ DO_TEST_CAPS_LATEST("graphics-vnc-auto-socket");
DO_TEST("graphics-vnc-none", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA);
DO_TEST("graphics-vnc-socket-new-cmdline", QEMU_CAPS_VNC,
QEMU_CAPS_DEVICE_CIRRUS_VGA);
--
2.31.1
More information about the libvir-list
mailing list