[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/15] tests/qemu-iotests: Fix test 033 for running with non-file
From: |
Kevin Wolf |
Subject: |
[PULL 06/15] tests/qemu-iotests: Fix test 033 for running with non-file protocols |
Date: |
Mon, 18 Mar 2024 14:01:09 +0100 |
From: Thomas Huth <thuth@redhat.com>
When running iotest 033 with the ssh protocol, it fails with:
033 fail [14:48:31] [14:48:41] 10.2s output mismatch
--- /.../tests/qemu-iotests/033.out
+++ /.../tests/qemu-iotests/scratch/qcow2-ssh-033/033.out.bad
@@ -174,6 +174,7 @@
512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
wrote 512/512 bytes at offset 2097152
512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+qemu-io: warning: Failed to truncate the tail of the image: ssh driver does
not support shrinking files
read 512/512 bytes at offset 0
512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
We already check for the qcow2 format here, so let's simply also
add a check for the protocol here, too, to only test the truncation
with the file protocol.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20240315111108.153201-2-thuth@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
tests/qemu-iotests/033 | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/qemu-iotests/033 b/tests/qemu-iotests/033
index da9133c44b..4bc7a071bd 100755
--- a/tests/qemu-iotests/033
+++ b/tests/qemu-iotests/033
@@ -123,9 +123,9 @@ do_test 512 "write -P 1 0 0x200" "$TEST_IMG" |
_filter_qemu_io
# next L2 table
do_test 512 "write -P 1 $L2_COVERAGE 0x200" "$TEST_IMG" | _filter_qemu_io
-# only interested in qcow2 here; also other formats might respond with
-# "not supported" error message
-if [ $IMGFMT = "qcow2" ]; then
+# only interested in qcow2 with file protocol here; also other formats
+# might respond with "not supported" error message
+if [ $IMGFMT = "qcow2" ] && [ $IMGPROTO = "file" ]; then
do_test 512 "truncate $L2_COVERAGE" "$TEST_IMG" | _filter_qemu_io
fi
--
2.44.0
- [PULL 07/15] tests/qemu-iotests: Restrict test 066 to the 'file' protocol, (continued)
- [PULL 07/15] tests/qemu-iotests: Restrict test 066 to the 'file' protocol, Kevin Wolf, 2024/03/18
- [PULL 03/15] iotests: Add test for reset/AioContext switches with NBD exports, Kevin Wolf, 2024/03/18
- [PULL 09/15] tests/qemu-iotests: Restrict test 130 to the 'file' protocol, Kevin Wolf, 2024/03/18
- [PULL 08/15] tests/qemu-iotests: Restrict test 114 to the 'file' protocol, Kevin Wolf, 2024/03/18
- [PULL 04/15] blockdev: Fix blockdev-snapshot-sync error reporting for no medium, Kevin Wolf, 2024/03/18
- [PULL 02/15] nbd/server: Fix race in draining the export, Kevin Wolf, 2024/03/18
- [PULL 12/15] tests/qemu-iotests: Restrict tests that use --image-opts to the 'file' protocol, Kevin Wolf, 2024/03/18
- [PULL 13/15] tests/qemu-iotests: Fix some tests that use --image-opts for other protocols, Kevin Wolf, 2024/03/18
- [PULL 05/15] qemu-img: Fix Column Width and Improve Formatting in snapshot list, Kevin Wolf, 2024/03/18
- [PULL 15/15] iotests: adapt to output change for recently introduced 'detached header' field, Kevin Wolf, 2024/03/18
- [PULL 06/15] tests/qemu-iotests: Fix test 033 for running with non-file protocols,
Kevin Wolf <=
- [PULL 14/15] tests/qemu-iotests: Restrict tests using "--blockdev file" to the file protocol, Kevin Wolf, 2024/03/18
- [PULL 10/15] tests/qemu-iotests: Restrict test 134 and 158 to the 'file' protocol, Kevin Wolf, 2024/03/18
- [PULL 11/15] tests/qemu-iotests: Restrict test 156 to the 'file' protocol, Kevin Wolf, 2024/03/18
- Re: [PULL 00/15] Block layer patches, Peter Maydell, 2024/03/19