Commit b01a1944 authored by Max Reitz's avatar Max Reitz
Browse files

iotests: Filter compat-dependent info in 198 



There is a bit of image-specific information which depends on the qcow2
compat level.  Filter it so that 198 works with compat=0.10 (and any
refcount_bits value).

Note that we cannot simply drop the --format-specific switch because we
do need the "encrypt" information.

Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
Message-id: 20171123020832.8165-18-mreitz@redhat.com
Reviewed-by: default avatarJohn Snow <jsnow@redhat.com>
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent 2483537e

tests/qemu-iotests/198

+4 −2
Original line number Diff line number Diff line
@@ -92,12 +92,14 @@ $QEMU_IO --object $SECRET0 --object $SECRET1 -c "read -P 0x9 0 $size" --image-op 
echo

echo "== checking image base =="

$QEMU_IMG info --image-opts $IMGSPECBASE | _filter_img_info --format-specific \

    | sed -e "/^disk size:/ D"

    | sed -e "/^disk size:/ D" -e '/refcount bits:/ D' -e '/compat:/ D' \

          -e '/lazy refcounts:/ D' -e '/corrupt:/ D'



echo

echo "== checking image layer =="

$QEMU_IMG info --image-opts $IMGSPECLAYER | _filter_img_info --format-specific \

    | sed -e "/^disk size:/ D"

    | sed -e "/^disk size:/ D" -e '/refcount bits:/ D' -e '/compat:/ D' \

          -e '/lazy refcounts:/ D' -e '/corrupt:/ D'





# success, all done

tests/qemu-iotests/198.out

+0 −8
Original line number Diff line number Diff line
@@ -36,9 +36,6 @@ image: json:{"encrypt.key-secret": "sec0", "driver": "IMGFMT", "file": {"driver" 
file format: IMGFMT

virtual size: 16M (16777216 bytes)

Format specific information:

    compat: 1.1

    lazy refcounts: false

    refcount bits: 16

    encrypt:

        ivgen alg: plain64

        hash alg: sha256
@@ -75,7 +72,6 @@ Format specific information: 
                key offset: 1810432

        payload offset: 2068480

        master key iters: 1024

    corrupt: false



== checking image layer ==

image: json:{"encrypt.key-secret": "sec1", "driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}}
@@ -83,9 +79,6 @@ file format: IMGFMT 
virtual size: 16M (16777216 bytes)

backing file: TEST_DIR/t.IMGFMT.base

Format specific information:

    compat: 1.1

    lazy refcounts: false

    refcount bits: 16

    encrypt:

        ivgen alg: plain64

        hash alg: sha256
@@ -122,5 +115,4 @@ Format specific information: 
                key offset: 1810432

        payload offset: 2068480

        master key iters: 1024

    corrupt: false

*** done