Commit 24b861c0 authored by Vladimir Sementsov-Ogievskiy's avatar Vladimir Sementsov-Ogievskiy Committed by Max Reitz
Browse files

iotests: don't test qcow2.py inside 291 



820c6bee added testing of qcow2.py into 291, and it breaks 291
with external data file. Actually, 291 is bad place for qcow2.py
testing, better add a separate test.

For now, drop qcow2.py testing from 291 to fix the regression.

Fixes: 820c6bee
Reported-by: default avatarMax Reitz <mreitz@redhat.com>
Signed-off-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20200618154052.8629-1-vsementsov@virtuozzo.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent e11543c5

tests/qemu-iotests/291

+0 −4
Original line number Diff line number Diff line
@@ -64,8 +64,6 @@ $QEMU_IO -c 'w 1M 1M' -f $IMGFMT "$TEST_IMG" | _filter_qemu_io 
$QEMU_IMG bitmap --disable -f $IMGFMT "$TEST_IMG" b1

$QEMU_IMG bitmap --enable -f $IMGFMT "$TEST_IMG" b2

$QEMU_IO -c 'w 2M 1M' -f $IMGFMT "$TEST_IMG" | _filter_qemu_io

echo "Check resulting qcow2 header extensions:"

$PYTHON qcow2.py "$TEST_IMG" dump-header-exts



echo

echo "=== Bitmap preservation not possible to non-qcow2 ==="
@@ -92,8 +90,6 @@ $QEMU_IMG bitmap --merge tmp -f $IMGFMT "$TEST_IMG" b0 
$QEMU_IMG bitmap --remove --image-opts \

    driver=$IMGFMT,file.driver=file,file.filename="$TEST_IMG" tmp

_img_info --format-specific

echo "Check resulting qcow2 header extensions:"

$PYTHON qcow2.py "$TEST_IMG" dump-header-exts



echo

echo "=== Check bitmap contents ==="

tests/qemu-iotests/291.out

+0 −33
Original line number Diff line number Diff line
@@ -14,25 +14,6 @@ wrote 1048576/1048576 bytes at offset 1048576 
1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

wrote 1048576/1048576 bytes at offset 2097152

1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

Check resulting qcow2 header extensions:

Header extension:

magic                     0xe2792aca (Backing format)

length                    5

data                      'qcow2'



Header extension:

magic                     0x6803f857 (Feature table)

length                    336

data                      <binary>



Header extension:

magic                     0x23852875 (Bitmaps)

length                    24

nb_bitmaps                2

reserved32                0

bitmap_directory_size     0x40

bitmap_directory_offset   0x510000





=== Bitmap preservation not possible to non-qcow2 ===
@@ -84,20 +65,6 @@ Format specific information: 
            granularity: 65536

    refcount bits: 16

    corrupt: false

Check resulting qcow2 header extensions:

Header extension:

magic                     0x6803f857 (Feature table)

length                    336

data                      <binary>



Header extension:

magic                     0x23852875 (Bitmaps)

length                    24

nb_bitmaps                3

reserved32                0

bitmap_directory_size     0x60

bitmap_directory_offset   0x520000





=== Check bitmap contents ===