[libvirt] [PATCH v2 3/3] tests: add test case for new syntax of VNC unix path with '='

Pavel Hrdina phrdina at redhat.com
Thu Jul 27 08:33:30 UTC 2017


Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
---

Notes:
    Changes in v2:
        - removed the test that should fail if qemu doesn't support new
          syntax for VNC

 ...muxml2argv-graphics-vnc-socket-new-cmdline.args | 22 ++++++++++++++++++++++
 ...emuxml2argv-graphics-vnc-socket-new-cmdline.xml | 20 ++++++++++++++++++++
 tests/qemuxml2argvtest.c                           |  2 ++
 3 files changed, 44 insertions(+)
 create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket-new-cmdline.args
 create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket-new-cmdline.xml

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket-new-cmdline.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket-new-cmdline.args
new file mode 100644
index 0000000000..862e96e066
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket-new-cmdline.args
@@ -0,0 +1,22 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/home/test \
+USER=test \
+LOGNAME=test \
+QEMU_AUDIO_DRV=none \
+/usr/bin/qemu-system-i686 \
+-name QEMUGuest1 \
+-S \
+-M pc \
+-m 214 \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-nodefaults \
+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
+server,nowait \
+-mon chardev=charmonitor,id=monitor,mode=readline \
+-no-acpi \
+-boot c \
+-usb \
+-vnc vnc=unix:/tmp/foo=bar.sock \
+-vga cirrus
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket-new-cmdline.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket-new-cmdline.xml
new file mode 100644
index 0000000000..2b9758fecb
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket-new-cmdline.xml
@@ -0,0 +1,20 @@
+<domain type='qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit='KiB'>219100</memory>
+  <currentMemory unit='KiB'>219100</currentMemory>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <type arch='i686' machine='pc'>hvm</type>
+  </os>
+  <devices>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <graphics type='vnc'>
+      <listen type='socket' socket='/tmp/foo=bar.sock'/>
+    </graphics>
+    <video>
+      <model type='cirrus' vram='16384' heads='1'/>
+    </video>
+    <memballoon model='none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 69e9535d3a..c2c1767c7e 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1058,6 +1058,8 @@ mymain(void)
     DO_TEST("graphics-vnc-auto-socket", QEMU_CAPS_VNC,
             QEMU_CAPS_DEVICE_CIRRUS_VGA);
     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, QEMU_CAPS_VNC_MULTI_SERVERS);
 
     driver.config->vncSASL = 1;
     VIR_FREE(driver.config->vncSASLdir);
-- 
2.13.3




More information about the libvir-list mailing list