libvirt/tests
Eric Blake 73470fe219 tests: be more explicit on qcow2 versions in virstoragetest
While working on v1.0.5-maint (the branch in use on Fedora 19)
with the host at Fedora 20, I got a failure in virstoragetest.
I traced it to the fact that we were using qemu-img to create a
qcow2 file, but qemu-img changed from creating v2 files by
default in F19 to creating v3 files in F20.  Rather than leaving
it up to qemu-img, it is better to write the test to force
testing of BOTH file formats (better code coverage and all).

This patch alone does not fix all the failures in v1.0.5-maint;
for that, we must decide to either teach the older branch to
understand v3 files, or to reject them outright as unsupported.
But for upstream, making the test less dependent on changing
qemu-img defaults is always a good thing.

* tests/virstoragetest.c (testPrepImages): Simplify creation of
raw file; check if qemu supports compat and if so use it.

Signed-off-by: Eric Blake <eblake@redhat.com>
(cherry picked from commit 974e591452)

Conflicts:
	tests/virstoragetest.c - hardcode test to v2, since this branch doesn't handle v3 correctly
2014-01-15 10:16:25 -07:00
..
capabilityschemadata capabilities: add NUMA memory information 2013-03-08 11:51:00 -07:00
commanddata build: clean up stray files found by 'make distcheck' 2013-05-06 14:01:08 -06:00
confdata
cputestdata
domainschemadata Add XML config for resource partitions 2013-04-15 17:35:31 +01:00
domainsnapshotxml2xmlin snapshot: new XML for external system checkpoint 2012-11-02 09:56:23 -06:00
domainsnapshotxml2xmlout qemu: auto-add pci-root controller for pc machine types 2013-04-25 13:05:10 +02:00
fchostdata/fc_host tests: Add tests for fc_host 2013-05-13 17:24:18 +08:00
interfaceschemadata
lxcxml2xmldata LXC: Fix handling of RAM filesystem size units 2013-10-15 16:29:34 +02:00
lxcxml2xmloutdata LXC: Fix handling of RAM filesystem size units 2013-10-15 16:29:34 +02:00
networkxml2confdata Revert "Add support for <option> tag in network config" 2013-02-27 10:55:24 -05:00
networkxml2xmlin Support for static routes on a virtual bridge 2013-05-13 16:14:40 -04:00
networkxml2xmlout Support for static routes on a virtual bridge 2013-05-13 16:14:40 -04:00
nodedevschemadata
nodeinfodata nodeinfotest: Add test data from a AMD bulldozer machine. 2012-11-13 00:35:36 +01:00
nwfilterxml2xmlin
nwfilterxml2xmlout
qemuhelpdata qemu: New cap flags for scsi-generic 2013-05-13 18:30:26 +08:00
qemuxml2argvdata conf: Generate address for scsi host device automatically 2013-06-01 10:00:23 +08:00
qemuxml2xmloutdata conf: Generate address for scsi host device automatically 2013-06-01 10:00:23 +08:00
qemuxmlnsdata qemu: pass -usb and usb hubs earlier, so USB disks with static address are handled properly 2012-10-30 08:54:32 +01:00
securityselinuxlabeldata Add a test suite for validating SELinux labelling 2013-01-14 13:40:04 +00:00
sexpr2xmldata storage: treat 'aio' like 'raw' at parse time 2012-10-19 17:35:09 -06:00
storagepoolschemadata schema: require target path in storage pool xml 2013-05-17 08:33:22 +02:00
storagepoolxml2xmlin Storage: Fix the indention of rbd test file 2013-06-03 11:20:01 +08:00
storagepoolxml2xmlout New XML attributes for storage pool source adapter 2013-04-08 18:41:06 +08:00
storagevolschemadata schema: make source optional in volume XML 2013-05-17 08:35:08 +02:00
storagevolxml2argvdata storage: move qemu-img options before positional arguments 2013-02-24 18:11:40 +01:00
storagevolxml2xmlin
storagevolxml2xmlout
sysinfodata Implement minimal sysinfo for ARM platforms 2013-04-04 11:07:31 +01:00
vmx2xmldata
xencapsdata
xmconfigdata
xml2sexprdata
xml2vmxdata util: Change virMacAddrFormat to lowercase hex characters 2013-04-02 15:53:43 +02:00
.valgrind.supp valgrind: Adjust the suppression file 2013-02-07 14:08:14 -05:00
capabilityschematest
commandhelper.c tests/: Remove the whitespace before ";" 2013-05-21 23:41:45 +08:00
commandtest.c Adapt to VIR_STRDUP and VIR_STRNDUP in tests/* 2013-05-10 11:54:29 +02:00
cpuset use virBitmap to store cpumask info. 2012-09-17 14:59:37 -04:00
cputest.c virutil: Move string related functions to virstring.c 2013-05-02 16:56:55 +02:00
define-dev-segfault
domainschematest LXC: Fix handling of RAM filesystem size units 2013-10-15 16:29:34 +02:00
domainsnapshotschematest
domainsnapshotxml2xmltest.c virutil: Move string related functions to virstring.c 2013-05-02 16:56:55 +02:00
esxutilstest.c virutil: Move string related functions to virstring.c 2013-05-02 16:56:55 +02:00
eventtest.c tests/: Remove the whitespace before ";" 2013-05-21 23:41:45 +08:00
fchosttest.c test: fix VPATH fchosttest failure 2013-05-17 12:09:52 +02:00
fdstreamtest.c Introduce virFilePrintf() as a portable fprintf() 2013-05-31 10:51:33 -06:00
int-overflow tests: Don't use bash if we don't have to 2011-07-29 17:17:21 +02:00
interfaceschematest
interfacexml2xmltest.c virutil: Move string related functions to virstring.c 2013-05-02 16:56:55 +02:00
jsontest.c json: support removing a value from an object 2013-05-13 15:15:54 -06:00
libvirtd-fail
libvirtd-pool
libvirtdconftest.c tests/: Remove the whitespace before ";" 2013-05-21 23:41:45 +08:00
lxcxml2xmltest.c LXC: Fix handling of RAM filesystem size units 2013-10-15 16:29:34 +02:00
Makefile.am build: Add lxc testcase to dist list 2013-10-15 16:29:41 +02:00
networkschematest
networkxml2conftest.c virutil: Move string related functions to virstring.c 2013-05-02 16:56:55 +02:00
networkxml2xmltest.c virutil: Move string related functions to virstring.c 2013-05-02 16:56:55 +02:00
nodedevschematest
nodedevxml2xmltest.c virutil: Move string related functions to virstring.c 2013-05-02 16:56:55 +02:00
nodeinfotest.c tests/: Remove the whitespace before ";" 2013-05-21 23:41:45 +08:00
nwfilterschematest
nwfilterxml2xmltest.c virutil: Move string related functions to virstring.c 2013-05-02 16:56:55 +02:00
object-locking.ml Rename 'DeviceMonitor' to 'NodeDeviceDriver' 2013-04-24 10:59:53 +01:00
oomtrace.pl
openvzutilstest.c Adapt to VIR_STRDUP and VIR_STRNDUP in tests/* 2013-05-10 11:54:29 +02:00
openvzutilstest.conf
pkix_asn1_tab.c
qemuargv2xmltest.c qemu: add ', share=<policy>' to qemu commandline 2013-05-22 19:18:48 +08:00
qemuhelptest.c qemu: new vnc display sharing policy caps flag 2013-05-22 19:18:37 +08:00
qemumonitorjsontest.c qemu: query command line options in QMP 2013-05-13 15:15:54 -06:00
qemumonitortest.c virutil: Move string related functions to virstring.c 2013-05-02 16:56:55 +02:00
qemumonitortestutils.c tests/: Remove the whitespace before ";" 2013-05-21 23:41:45 +08:00
qemumonitortestutils.h maint: Rename xmlconf to xmlopt and virDomainXMLConfig to virDomainXMLOption 2013-04-04 22:18:56 +02:00
qemuxml2argvtest.c qemu: add ', share=<policy>' to qemu commandline 2013-05-22 19:18:48 +08:00
qemuxml2xmltest.c conf: Generate address for scsi host device automatically 2013-06-01 10:00:23 +08:00
qemuxmlnstest.c qemu: Add callback struct for qemuBuildCommandLine 2013-05-20 20:14:19 +08:00
read-bufsiz
read-non-seekable
reconnect.c Rename command.{c,h} to vircommand.{c,h} 2012-12-21 11:17:13 +00:00
schematestutils.sh tests: use portable shell code 2013-05-09 11:46:45 -06:00
seclabeltest.c tests: uniformly report test failures 2013-02-25 17:38:11 -07:00
securityselinuxhelper.c Adapt to VIR_STRDUP and VIR_STRNDUP in tests/* 2013-05-10 11:54:29 +02:00
securityselinuxlabeltest.c tests/: Remove the whitespace before ";" 2013-05-21 23:41:45 +08:00
securityselinuxtest.c util: move virFile* functions from virutil.c to virfile.c 2013-05-10 13:09:30 -04:00
sexpr2xmltest.c virutil: Move string related functions to virstring.c 2013-05-02 16:56:55 +02:00
shunloadhelper.c shunloadtest: Resolve Coverity CHECKED_RETURN error 2013-05-21 09:22:21 -04:00
shunloadtest.c shunloadtest: Resolve Coverity CHECKED_RETURN error 2013-05-21 09:22:21 -04:00
sockettest.c Rename memory.{c,h} to viralloc.{c,h} 2012-12-21 11:17:14 +00:00
ssh.c tests/: Remove the whitespace before ";" 2013-05-21 23:41:45 +08:00
start
statstest.c Rename stats_linux.{c,h} to virstatslinux.{c,h} 2012-12-21 11:19:48 +00:00
storagebackendsheepdogtest.c Build breaker - requires VIR_FROM_THIS 2013-05-10 08:52:43 -04:00
storagepoolschematest schema: require target path in storage pool xml 2013-05-17 08:33:22 +02:00
storagepoolxml2xmltest.c virutil: Move string related functions to virstring.c 2013-05-02 16:56:55 +02:00
storagevolschematest schema: make source optional in volume XML 2013-05-17 08:35:08 +02:00
storagevolxml2argvtest.c virutil: Move string related functions to virstring.c 2013-05-02 16:56:55 +02:00
storagevolxml2xmltest.c virutil: Move string related functions to virstring.c 2013-05-02 16:56:55 +02:00
sysinfotest.c virutil: Move string related functions to virstring.c 2013-05-02 16:56:55 +02:00
test_conf.c rename tests/conftest.c 2013-03-19 13:13:28 -06:00
test_conf.sh rename tests/conftest.c 2013-03-19 13:13:28 -06:00
test-lib.sh
testutils.c tests/: Remove the whitespace before ";" 2013-05-21 23:41:45 +08:00
testutils.h Ensure LD_PRELOAD exists before running test case 2013-04-05 10:41:46 +01:00
testutilslxc.c virCaps: get rid of defaultConsoleTargetType callback 2013-04-04 22:42:39 +02:00
testutilslxc.h
testutilsqemu.c qemu: Add callback struct for qemuBuildCommandLine 2013-05-20 20:14:19 +08:00
testutilsqemu.h build: skip qemu in tests when !WITH_QEMU 2013-05-31 11:35:34 -06:00
testutilsxen.c virCaps: get rid of defaultConsoleTargetType callback 2013-04-04 22:42:39 +02:00
testutilsxen.h virCaps: get rid of defaultConsoleTargetType callback 2013-04-04 22:42:39 +02:00
utiltest.c Rename util.{c,h} to virutil.{c,h} 2012-12-21 11:19:49 +00:00
vcpupin
viratomictest.c Rename threads.{c,h} to virthread.{c,h} 2012-12-21 11:19:49 +00:00
virauthconfigtest.c virutil: Move string related functions to virstring.c 2013-05-02 16:56:55 +02:00
virbitmaptest.c Resolve valgrind error 2013-04-16 07:13:43 -04:00
virbuftest.c virutil: Move string related functions to virstring.c 2013-05-02 16:56:55 +02:00
vircgroupmock.c Workaround issue with clang and inline functions with static vars 2013-05-14 15:00:22 +01:00
vircgrouptest.c cgroups: Do not enforce nonexistent controllers 2013-05-24 12:11:24 +02:00
virdrivermoduletest.c virutil: Move string related functions to virstring.c 2013-05-02 16:56:55 +02:00
virendiantest.c util: add virendian.h macros 2013-02-12 09:00:15 -07:00
virhashdata.h
virhashtest.c virutil: Move string related functions to virstring.c 2013-05-02 16:56:55 +02:00
viridentitytest.c virutil: Move string related functions to virstring.c 2013-05-02 16:56:55 +02:00
virkeycodetest.c Add a test suite for keycode mapping functions 2013-04-08 10:03:20 +01:00
virkeyfiletest.c virutil: Move string related functions to virstring.c 2013-05-02 16:56:55 +02:00
virlockspacetest.c util: move virFile* functions from virutil.c to virfile.c 2013-05-10 13:09:30 -04:00
virnetmessagetest.c Adapt to VIR_STRDUP and VIR_STRNDUP in tests/* 2013-05-10 11:54:29 +02:00
virnetsockettest.c tests/: Remove the whitespace before ";" 2013-05-21 23:41:45 +08:00
virnettlscontexttest.c Fix TLS tests with gnutls 3 2013-03-04 17:42:16 +00:00
virportallocatortest.c util: move virFile* functions from virutil.c to virfile.c 2013-05-10 13:09:30 -04:00
virsh-all
virsh-optparse virsh: add snapshot-create-as memspec support 2012-11-07 09:04:18 -07:00
virsh-schedinfo Allow multiple parameters for schedinfo 2013-04-03 08:49:30 +02:00
virsh-synopsis
virsh-undefine build: avoid confusing make with raw name 'undefine' 2012-09-12 11:27:22 -06:00
virshtest.c virutil: Move string related functions to virstring.c 2013-05-02 16:56:55 +02:00
virstoragetest.c tests: be more explicit on qcow2 versions in virstoragetest 2014-01-15 10:16:25 -07:00
virstringtest.c Introduce virFilePrintf() as a portable fprintf() 2013-05-31 10:51:33 -06:00
virt-aa-helper-test add vnc unix sockets to apparmor policy 2012-12-11 14:32:39 -07:00
virtimetest.c virutil: Move string related functions to virstring.c 2013-05-02 16:56:55 +02:00
viruritest.c tests/: Remove the whitespace before ";" 2013-05-21 23:41:45 +08:00
vmx2xmltest.c Adapt to VIR_STRDUP and VIR_STRNDUP in tests/* 2013-05-10 11:54:29 +02:00
xencapstest.c xencapstest: Resolve Coverity CHECKED_RETURN error 2013-05-21 09:22:21 -04:00
xmconfigtest.c virutil: Move string related functions to virstring.c 2013-05-02 16:56:55 +02:00
xml2sexprtest.c virutil: Move string related functions to virstring.c 2013-05-02 16:56:55 +02:00
xml2vmxtest.c Adapt to VIR_STRDUP and VIR_STRNDUP in tests/* 2013-05-10 11:54:29 +02:00