[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v2 04/21] iotests: Filter refcount_order in 036
From: |
Maxim Levitsky |
Subject: |
Re: [PATCH v2 04/21] iotests: Filter refcount_order in 036 |
Date: |
Wed, 06 Nov 2019 17:45:01 +0200 |
On Tue, 2019-10-15 at 16:27 +0200, Max Reitz wrote:
> This test can run just fine with other values for refcount_bits, so we
> should filter the value from qcow2.py's dump-header. In fact, we can
> filter everything but the feature bits and header extensions, because
> that is what the test is about.
>
> (036 currently ignores user-specified image options, but that will be
> fixed in the next patch.)
>
> Signed-off-by: Max Reitz <address@hidden>
> ---
> tests/qemu-iotests/036 | 9 ++++---
> tests/qemu-iotests/036.out | 48 --------------------------------------
> 2 files changed, 6 insertions(+), 51 deletions(-)
>
> diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036
> index f06ff67408..5f929ad3be 100755
> --- a/tests/qemu-iotests/036
> +++ b/tests/qemu-iotests/036
> @@ -55,7 +55,8 @@ $PYTHON qcow2.py "$TEST_IMG" set-feature-bit incompatible 63
>
> # Without feature table
> $PYTHON qcow2.py "$TEST_IMG" del-header-ext 0x6803f857
> -$PYTHON qcow2.py "$TEST_IMG" dump-header
> +$PYTHON qcow2.py "$TEST_IMG" dump-header | grep features
> +$PYTHON qcow2.py "$TEST_IMG" dump-header-exts
> _img_info
>
> # With feature table containing bit 63
> @@ -103,14 +104,16 @@ echo === Create image with unknown autoclear feature
> bit ===
> echo
> _make_test_img 64M
> $PYTHON qcow2.py "$TEST_IMG" set-feature-bit autoclear 63
> -$PYTHON qcow2.py "$TEST_IMG" dump-header
> +$PYTHON qcow2.py "$TEST_IMG" dump-header | grep features
> +$PYTHON qcow2.py "$TEST_IMG" dump-header-exts
>
> echo
> echo === Repair image ===
> echo
> _check_test_img -r all
>
> -$PYTHON qcow2.py "$TEST_IMG" dump-header
> +$PYTHON qcow2.py "$TEST_IMG" dump-header | grep features
> +$PYTHON qcow2.py "$TEST_IMG" dump-header-exts
>
> # success, all done
> echo "*** done"
> diff --git a/tests/qemu-iotests/036.out b/tests/qemu-iotests/036.out
> index 15229a9604..0b52b934e1 100644
> --- a/tests/qemu-iotests/036.out
> +++ b/tests/qemu-iotests/036.out
> @@ -3,25 +3,9 @@ QA output created by 036
> === Image with unknown incompatible feature bit ===
>
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> -magic 0x514649fb
> -version 3
> -backing_file_offset 0x0
> -backing_file_size 0x0
> -cluster_bits 16
> -size 67108864
> -crypt_method 0
> -l1_size 1
> -l1_table_offset 0x30000
> -refcount_table_offset 0x10000
> -refcount_table_clusters 1
> -nb_snapshots 0
> -snapshot_offset 0x0
> incompatible_features [63]
> compatible_features []
> autoclear_features []
> -refcount_order 4
> -header_length 104
> -
> qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Unsupported IMGFMT feature(s):
> Unknown incompatible feature: 8000000000000000
> qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Unsupported IMGFMT feature(s):
> Test feature
>
> @@ -37,25 +21,9 @@ qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Unsupported
> IMGFMT feature(s): tes
> === Create image with unknown autoclear feature bit ===
>
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> -magic 0x514649fb
> -version 3
> -backing_file_offset 0x0
> -backing_file_size 0x0
> -cluster_bits 16
> -size 67108864
> -crypt_method 0
> -l1_size 1
> -l1_table_offset 0x30000
> -refcount_table_offset 0x10000
> -refcount_table_clusters 1
> -nb_snapshots 0
> -snapshot_offset 0x0
> incompatible_features []
> compatible_features []
> autoclear_features [63]
> -refcount_order 4
> -header_length 104
> -
> Header extension:
> magic 0x6803f857
> length 192
> @@ -65,25 +33,9 @@ data <binary>
> === Repair image ===
>
> No errors were found on the image.
> -magic 0x514649fb
> -version 3
> -backing_file_offset 0x0
> -backing_file_size 0x0
> -cluster_bits 16
> -size 67108864
> -crypt_method 0
> -l1_size 1
> -l1_table_offset 0x30000
> -refcount_table_offset 0x10000
> -refcount_table_clusters 1
> -nb_snapshots 0
> -snapshot_offset 0x0
> incompatible_features []
> compatible_features []
> autoclear_features []
> -refcount_order 4
> -header_length 104
> -
> Header extension:
> magic 0x6803f857
> length 192
Great!
Reviewed-by: Maxim Levitsky <address@hidden>
Best regards,
Maxim Levitsky
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Re: [PATCH v2 04/21] iotests: Filter refcount_order in 036,
Maxim Levitsky <=