iotests: Fix 291 across more file systems
PATCH 1/1 iotests: Fix 291 across more file systems
Depending on the granularity of holes and amount of metadata consumed by a file, the 'disk size:' number of 'qemu-img info' is not reliable. Adjust our test to use a different set of filters to avoid spurious failures.
--- tests/qemu-iotests/291 | 4 ++-- tests/qemu-iotests/291.out | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
tests/qemu-iotests/291 +2 -2
@@ -77,7 +77,7 @@ echo # Only bitmaps from the active layer are copied $QEMU_IMG convert --bitmaps -O qcow2 "$TEST_IMG.orig" "$TEST_IMG" -$QEMU_IMG info "$TEST_IMG" | _filter_img_info --format-specific +_img_info --format-specific # But we can also merge in bitmaps from other layers. This test is a bit # contrived to cover more code paths, in reality, you could merge directly # into b0 without going through tmp
@@ -87,7 +87,7 @@ $QEMU_IMG bitmap --add --merge b0 -b "$TEST_IMG.base" -F $IMGFMT \ $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 -$QEMU_IMG info "$TEST_IMG" | _filter_img_info --format-specific +_img_info --format-specific echo echo "=== Check bitmap contents ==="
tests/qemu-iotests/291.out +2 -2
@@ -24,7 +24,7 @@ qemu-img: Format driver 'raw' does not support bitmaps image: TEST_DIR/t.IMGFMT file format: IMGFMT virtual size: 10 MiB (10485760 bytes) -disk size: 4.39 MiB +cluster_size: 65536 Format specific information: compat: 1.1 compression type: zlib
@@ -44,7 +44,7 @@ Format specific information: image: TEST_DIR/t.IMGFMT file format: IMGFMT virtual size: 10 MiB (10485760 bytes) -disk size: 4.48 MiB +cluster_size: 65536 Format specific information: compat: 1.1 compression type: zlib
Signature · 1 line
2.27.0
Kevin Wolf
AppliedAm 08.06.2020 um 21:56 hat Eric Blake geschrieben:
Quoted 8 lines
Depending on the granularity of holes and amount of metadata consumed by a file, the 'disk size:' number of 'qemu-img info' is not reliable. Adjust our test to use a different set of filters to avoid spurious failures.
Reported-by Kevin Wolf <[email protected]>Fixes cf2d1203dcSigned-off-by Eric Blake <[email protected]>
Thanks, applied to the block branch.
Kevin
Quoted 11 lines · Kevin Wolf
Am 08.06.2020 um 21:56 hat Eric Blake geschrieben:
Quoted 8 lines
Depending on the granularity of holes and amount of metadata consumed by a file, the 'disk size:' number of 'qemu-img info' is not reliable. Adjust our test to use a different set of filters to avoid spurious failures.
Reported-by Kevin Wolf <[email protected]>Fixes cf2d1203dcSigned-off-by Eric Blake <[email protected]>Thanks, applied to the block branch.
It has a conflict with one of Vladimir's bitmaps patches that I'm about to send a pull request for; so I'll resolve the conflict and include it in my bitmaps tree instead, and you can drop it from yours. I'm assuming I can add your Acked-by since you were willing to stage it.
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Am 09.06.2020 um 22:46 hat Eric Blake geschrieben:
Quoted 11 lines · Kevin Wolf
Quoted 10 lines
Am 08.06.2020 um 21:56 hat Eric Blake geschrieben:
Quoted 8 lines
Depending on the granularity of holes and amount of metadata consumed by a file, the 'disk size:' number of 'qemu-img info' is not reliable. Adjust our test to use a different set of filters to avoid spurious failures.
Reported-by Kevin Wolf <[email protected]>Fixes cf2d1203dcSigned-off-by Eric Blake <[email protected]>
Quoted 6 lines
Quoted 1 line
Thanks, applied to the block branch.
It has a conflict with one of Vladimir's bitmaps patches that I'm about to send a pull request for; so I'll resolve the conflict and include it in my bitmaps tree instead, and you can drop it from yours. I'm assuming I can add your Acked-by since you were willing to stage it.
Ok, no problem.
Kevin