iotests/046: Filter request length
PATCH 1/1 iotests/046: Filter request length
For its concurrent requests, 046 has always filtered the offset, probably because concurrent requests may settle in any order. However, it did not filter the request length, and so if requests with different lengths settle in an unexpected order (notably the longer request before the shorter request), the test fails (for no good reason).
Filter the length, too.
---
This has annoyed me for quite some time now, but when rebasing (and testing) my FUSE export series, it became apparent that on a FUSE export qcow2 images with -o compat=0.10 always fail this test (because the first 56k request settles before its accompanying 8k request), so now I'm forced to do something about it.
--- tests/qemu-iotests/046 | 3 +- tests/qemu-iotests/046.out | 104 ++++++++++++++++++------------------- 2 files changed, 54 insertions(+), 53 deletions(-)
tests/qemu-iotests/046 +2 -1
@@ -186,7 +186,8 @@ EOF } overlay_io | $QEMU_IO blkdebug::"$TEST_IMG" | _filter_qemu_io |\ - sed -e 's/bytes at offset [0-9]*/bytes at offset XXX/g' + sed -e 's/[0-9]*\/[0-9]* bytes at offset [0-9]*/XXX\/XXX bytes at offset XXX/g' \ + -e 's/^[0-9]* KiB/XXX KiB/g' echo echo "== Verify image content =="
tests/qemu-iotests/046.out +52 -52
126 lines not on this page · raw message
Signature · 1 line
2.26.2
Max Reitz
AppliedQuoted 15 lines · Max Reitz
For its concurrent requests, 046 has always filtered the offset, probably because concurrent requests may settle in any order. However, it did not filter the request length, and so if requests with different lengths settle in an unexpected order (notably the longer request before the shorter request), the test fails (for no good reason).
Filter the length, too.
Signed-off-by Max Reitz <[email protected]>---
This has annoyed me for quite some time now, but when rebasing (and testing) my FUSE export series, it became apparent that on a FUSE export qcow2 images with -o compat=0.10 always fail this test (because the first 56k request settles before its accompanying 8k request), so now I'm forced to do something about it.
Quoted 4 lines
--- tests/qemu-iotests/046 | 3 +- tests/qemu-iotests/046.out | 104 ++++++++++++++++++------------------- 2 files changed, 54 insertions(+), 53 deletions(-)
Applied to my block branch.
Max