From: Peter Krempa Date: Mon, 28 Jan 2019 11:43:13 +0000 (+0100) Subject: tests: qemuxml2argv: Remove testing of post startup change to 'cachemode' for shared... X-Git-Tag: v5.1.0-rc1~220 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee498250e7aee4c7e0b7ce9fce30e8d6e4d2f885;p=thirdparty%2Flibvirt.git tests: qemuxml2argv: Remove testing of post startup change to 'cachemode' for shared disks Testing that the cachemode is properly recorded to the configuration after startup does not add much value and overcomplicates the xml2argv test. Remove the 'disk-shared' test with old capabilities as the test with real capabilities covers the code sufficiently. Signed-off-by: Peter Krempa --- diff --git a/tests/qemuxml2argvdata/disk-shared.args b/tests/qemuxml2argvdata/disk-shared.args deleted file mode 100644 index 550708c3b3..0000000000 --- a/tests/qemuxml2argvdata/disk-shared.args +++ /dev/null @@ -1,31 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ --m 214 \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ -server,nowait \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0,\ -cache=none \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1,serial=XYZXYZXYZYXXYZYZYXYZY \ --drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-1-0,\ -media=cdrom,readonly=on \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 5022061e04..c3f4640044 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1105,7 +1105,6 @@ mymain(void) DO_TEST_PARSE_ERROR("disk-fmt-cow", NONE); DO_TEST_PARSE_ERROR("disk-fmt-dir", NONE); DO_TEST_PARSE_ERROR("disk-fmt-iso", NONE); - DO_TEST_WITH_STARTUP("disk-shared", NONE); DO_TEST_CAPS_VER("disk-shared", "2.12.0"); DO_TEST_CAPS_LATEST("disk-shared"); DO_TEST_PARSE_ERROR("disk-shared-qcow", NONE); diff --git a/tests/qemuxml2startupxmloutdata/disk-shared.xml b/tests/qemuxml2startupxmloutdata/disk-shared.xml deleted file mode 100644 index 60b7eca788..0000000000 --- a/tests/qemuxml2startupxmloutdata/disk-shared.xml +++ /dev/null @@ -1,56 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - - - XYZXYZXYZYXXYZYZYXYZY - -
- - - - - - - -
- - - -
- - - -
- - - - - - - - - - - - -
- - -