From 8be88034bfc2aafd69b8e3a01d8363b191266eae Mon Sep 17 00:00:00 2001 From: Doug Goldstein Date: Fri, 19 Oct 2012 14:40:51 -0500 Subject: [PATCH] test: Don't assume VNC is always available Several tests assume that VNC is always available and include it in their configs and the expected command line. The tests have nothing to do with graphics display so they shouldn't rely on VNC. --- tests/qemuxml2argvdata/qemuxml2argv-bios.args | 6 +++--- tests/qemuxml2argvdata/qemuxml2argv-bios.xml | 4 ---- .../qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args | 6 +++--- tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml | 5 ----- tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args | 6 +++--- tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.xml | 5 ----- tests/qemuxml2argvdata/qemuxml2argv-event_idx.args | 6 +++--- tests/qemuxml2argvdata/qemuxml2argv-event_idx.xml | 8 -------- tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args | 6 +++--- tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.xml | 8 -------- 10 files changed, 15 insertions(+), 45 deletions(-) diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bios.args b/tests/qemuxml2argvdata/qemuxml2argv-bios.args index ac980006c1..89b0f7f81b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-bios.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-bios.args @@ -1,7 +1,7 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ /usr/bin/qemu -S -M pc -bios /usr/share/seabios/bios.bin \ --m 1024 -smp 1 -nodefaults -device sga \ +-m 1024 -smp 1 -nographic -nodefaults -device sga \ -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ -hda /dev/HostVG/QEMUGuest1 -serial pty \ --usb -device usb-tablet,id=input0 -vnc 127.0.0.1:0 \ +-usb -device usb-tablet,id=input0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bios.xml b/tests/qemuxml2argvdata/qemuxml2argv-bios.xml index d1795f63f8..52acba4099 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-bios.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-bios.xml @@ -32,10 +32,6 @@ - - diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args index 2ca586d6d2..6f692eba18 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args @@ -1,5 +1,5 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc-0.13 -m 1024 -smp 1 -nodefaults \ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ +/usr/bin/qemu -S -M pc-0.13 -m 1024 -smp 1 -nographic -nodefaults \ -monitor unix:/tmp/test-monitor,server,nowait -no-acpi \ -boot dc -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \ -drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0,copy-on-read=on \ @@ -7,5 +7,5 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,if=none,media=cdrom,id=drive-ide0-1-0 \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ -device virtio-net-pci,tx=bh,vlan=0,id=net0,mac=52:54:00:e5:48:58,bus=pci.0,addr=0x3 \ --net user,vlan=0,name=hostnet0 -serial pty -usb -vnc 127.0.0.1:-809 -std-vga \ +-net user,vlan=0,name=hostnet0 -serial pty -usb \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml index 3034647736..0834cf20cb 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml @@ -42,10 +42,5 @@ - -