Commit 1b53eab2 authored by Max Reitz's avatar Max Reitz Committed by Stefan Hajnoczi
Browse files

iotests: Use _img_info 



qemu-img info should only be used directly if the format-specific
information or the name of the format is relevant (some tests explicitly
test format-specific information; test 082 uses qcow2-specific settings
to test the qemu-img interface); otherwise, tests should always use
_img_info instead.

Test 082 was touched only partially. It does test the qemu-img
interface; however, its invocations of qemu-img info are not real tests
but rather verifications, so if format-specific information is not
important for the test, there is no reason not to use _img_info. In
contrast to directly invoking qemu-img info, "qcow2" is replaced by
"IMGFMT"; but as "qcow2" is only mentioned once in test 082 (in
_supported_fmt), I consider this an improvement.

Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Message-id: 1412105489-7681-2-git-send-email-mreitz@redhat.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent f5bebbbb

tests/qemu-iotests/070

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ _use_sample_img test-disk2vhd.vhdx.bz2 


echo

echo "=== Verify image created by Disk2VHD can be opened ==="

$QEMU_IMG info "$TEST_IMG" 2>&1 | _filter_testdir | _filter_qemu

_img_info



# success, all done

echo "*** done"

tests/qemu-iotests/070.out

+2 −3
Original line number Diff line number Diff line
@@ -20,9 +20,8 @@ read 18874368/18874368 bytes at offset 0 
18 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)



=== Verify image created by Disk2VHD can be opened ===

image: TEST_DIR/test-disk2vhd.vhdx

file format: vhdx

image: TEST_DIR/test-disk2vhd.IMGFMT

file format: IMGFMT

virtual size: 256M (268435456 bytes)

disk size: 260M

cluster_size: 2097152

*** done

tests/qemu-iotests/082

+6 −6
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ echo === create: Options specified more than once === 


# Last -f should win

run_qemu_img create -f foo -f $IMGFMT "$TEST_IMG" $size

run_qemu_img info "$TEST_IMG"

_img_info



# Multiple -o should be merged

run_qemu_img create -f $IMGFMT -o cluster_size=4k -o lazy_refcounts=on "$TEST_IMG" $size
@@ -66,7 +66,7 @@ run_qemu_img info "$TEST_IMG" 
run_qemu_img create -f $IMGFMT -o cluster_size=4k -o lazy_refcounts=on -o cluster_size=8k "$TEST_IMG" $size

run_qemu_img info "$TEST_IMG"

run_qemu_img create -f $IMGFMT -o cluster_size=4k,cluster_size=8k "$TEST_IMG" $size

run_qemu_img info "$TEST_IMG"

_img_info



echo

echo === create: help for -o ===
@@ -106,11 +106,11 @@ run_qemu_img create -f $IMGFMT "$TEST_IMG" $size 


# Last -f should win

run_qemu_img convert -f foo -f $IMGFMT "$TEST_IMG" "$TEST_IMG".base

run_qemu_img info "$TEST_IMG".base

TEST_IMG="${TEST_IMG}.base" _img_info



# Last -O should win

run_qemu_img convert -O foo -O $IMGFMT "$TEST_IMG" "$TEST_IMG".base

run_qemu_img info "$TEST_IMG".base

TEST_IMG="${TEST_IMG}.base" _img_info



# Multiple -o should be merged

run_qemu_img convert -O $IMGFMT -o cluster_size=4k -o lazy_refcounts=on "$TEST_IMG" "$TEST_IMG".base
@@ -120,7 +120,7 @@ run_qemu_img info "$TEST_IMG".base 
run_qemu_img convert -O $IMGFMT -o cluster_size=4k -o lazy_refcounts=on -o cluster_size=8k "$TEST_IMG" "$TEST_IMG".base

run_qemu_img info "$TEST_IMG".base

run_qemu_img convert -O $IMGFMT -o cluster_size=4k,cluster_size=8k "$TEST_IMG" "$TEST_IMG".base

run_qemu_img info "$TEST_IMG".base

TEST_IMG="${TEST_IMG}.base" _img_info



echo

echo === convert: help for -o ===
@@ -167,7 +167,7 @@ run_qemu_img info "$TEST_IMG" 
run_qemu_img amend -f $IMGFMT -o size=8M -o lazy_refcounts=on -o size=132M "$TEST_IMG"

run_qemu_img info "$TEST_IMG"

run_qemu_img amend -f $IMGFMT -o size=4M,size=148M "$TEST_IMG"

run_qemu_img info "$TEST_IMG"

_img_info



echo

echo === amend: help for -o ===

tests/qemu-iotests/082.out

+11 −44
Original line number Diff line number Diff line
@@ -4,16 +4,10 @@ QA output created by 082 


Testing: create -f foo -f qcow2 TEST_DIR/t.qcow2 128M

Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=134217728 encryption=off cluster_size=65536 lazy_refcounts=off 



Testing: info TEST_DIR/t.qcow2

image: TEST_DIR/t.qcow2

file format: qcow2

image: TEST_DIR/t.IMGFMT

file format: IMGFMT

virtual size: 128M (134217728 bytes)

disk size: 196K

cluster_size: 65536

Format specific information:

    compat: 1.1

    lazy refcounts: false



Testing: create -f qcow2 -o cluster_size=4k -o lazy_refcounts=on TEST_DIR/t.qcow2 128M

Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=134217728 encryption=off cluster_size=4096 lazy_refcounts=on
@@ -43,16 +37,10 @@ Format specific information: 


Testing: create -f qcow2 -o cluster_size=4k,cluster_size=8k TEST_DIR/t.qcow2 128M

Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=134217728 encryption=off cluster_size=8192 lazy_refcounts=off 



Testing: info TEST_DIR/t.qcow2

image: TEST_DIR/t.qcow2

file format: qcow2

image: TEST_DIR/t.IMGFMT

file format: IMGFMT

virtual size: 128M (134217728 bytes)

disk size: 28K

cluster_size: 8192

Format specific information:

    compat: 1.1

    lazy refcounts: false



=== create: help for -o ===
@@ -188,24 +176,15 @@ Testing: create -f qcow2 TEST_DIR/t.qcow2 128M 
Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=134217728 encryption=off cluster_size=65536 lazy_refcounts=off 



Testing: convert -f foo -f qcow2 TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base



Testing: info TEST_DIR/t.qcow2.base

image: TEST_DIR/t.qcow2.base

image: TEST_DIR/t.IMGFMT.base

file format: raw

virtual size: 128M (134217728 bytes)

disk size: 0



Testing: convert -O foo -O qcow2 TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base



Testing: info TEST_DIR/t.qcow2.base

image: TEST_DIR/t.qcow2.base

file format: qcow2

image: TEST_DIR/t.IMGFMT.base

file format: IMGFMT

virtual size: 128M (134217728 bytes)

disk size: 196K

cluster_size: 65536

Format specific information:

    compat: 1.1

    lazy refcounts: false



Testing: convert -O qcow2 -o cluster_size=4k -o lazy_refcounts=on TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
@@ -232,16 +211,10 @@ Format specific information: 
    lazy refcounts: true



Testing: convert -O qcow2 -o cluster_size=4k,cluster_size=8k TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base



Testing: info TEST_DIR/t.qcow2.base

image: TEST_DIR/t.qcow2.base

file format: qcow2

image: TEST_DIR/t.IMGFMT.base

file format: IMGFMT

virtual size: 128M (134217728 bytes)

disk size: 28K

cluster_size: 8192

Format specific information:

    compat: 1.1

    lazy refcounts: false



=== convert: help for -o ===
@@ -410,16 +383,10 @@ Format specific information: 
    lazy refcounts: true



Testing: amend -f qcow2 -o size=4M,size=148M TEST_DIR/t.qcow2



Testing: info TEST_DIR/t.qcow2

image: TEST_DIR/t.qcow2

file format: qcow2

image: TEST_DIR/t.IMGFMT

file format: IMGFMT

virtual size: 148M (155189248 bytes)

disk size: 196K

cluster_size: 65536

Format specific information:

    compat: 1.1

    lazy refcounts: true



=== amend: help for -o ===

tests/qemu-iotests/095

+2 −2
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ _make_test_img -b "${TEST_IMG}.snp1" $size_larger 


echo

echo "=== Base image info before commit and resize ==="

$QEMU_IMG info "${TEST_IMG}.base" | _filter_testdir

TEST_IMG="${TEST_IMG}.base" _img_info



echo

echo === Running QEMU Live Commit Test ===
@@ -78,7 +78,7 @@ _send_qemu_cmd $h "{ 'execute': 'block-commit', 


echo

echo "=== Base image info after commit and resize ==="

$QEMU_IMG info "${TEST_IMG}.base" | _filter_testdir

TEST_IMG="${TEST_IMG}.base" _img_info



# success, all done

echo "*** done"