[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v7 3/3] block: enable testing of LUKS driver wit
From: |
Max Reitz |
Subject: |
Re: [Qemu-devel] [PATCH v7 3/3] block: enable testing of LUKS driver with block I/O tests |
Date: |
Wed, 30 Mar 2016 18:03:29 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.7.1 |
On 30.03.2016 15:53, Daniel P. Berrange wrote:
> This adds support for testing the LUKS driver with the block
> I/O test framework.
>
> cd tests/qemu-io-tests
> ./check -luks
>
> A handful of test cases are modified to work with luks
>
> - 004 - whitelist luks format
> - 012 - use TEST_IMG_FILE instead of TEST_IMG for file ops
> - 048 - use TEST_IMG_FILE instead of TEST_IMG for file ops.
Well, that doesn't always work now that you kept TEST_IMG_FILE unset for
file-protocol tests.
(Both fail because some command in them cannot find the file ''.)
> don't assume extended image contents is all zeros,
> explicitly initialize with zeros
> Make file size smaller to avoid having to decrypt
> 1 GB of data.
> - 052 - don't assume initial image contents is all zeros,
> explicitly initialize with zeros
> - 100 - don't assume initial image contents is all zeros,
> explicitly initialize with zeros
>
> With this patch applied, the results are as follows:
>
> Passed: 001 002 003 004 005 008 009 010 011 012 021 032 043
> 047 048 049 052 087 100 134 143
> Failed: 033 120 140 145
> Skipped: 007 013 014 015 017 018 019 020 022 023 024 025 026
> 027 028 029 030 031 034 035 036 037 038 039 040 041
> 042 043 044 045 046 047 049 050 051 053 054 055 056
> 057 058 059 060 061 062 063 064 065 066 067 068 069
> 070 071 072 073 074 075 076 077 078 079 080 081 082
> 083 084 085 086 087 088 089 090 091 092 093 094 095
> 096 097 098 099 101 102 103 104 105 107 108 109 110
> 111 112 113 114 115 116 117 118 119 121 122 123 124
> 128 129 130 131 132 133 134 135 136 137 138 139 141
> 142 144 146 148
>
> The reasons for the failed tests are:
>
> - 033 - needs adapting to use image opts syntax with blkdebug
> and test image in order to correctly set align property
> - 120 - needs adapting to use correct -drive syntax for luks
> - 140 - needs adapting to use correct -drive syntax for luks
> - 145 - needs adapting to use correct -drive syntax for luks
>
> The vast majority of skipped tests are exercising code that is
> qcow2 specific, though a couple could probably be usefully
> enabled for luks too.
>
> Signed-off-by: Daniel P. Berrange <address@hidden>
> ---
> tests/qemu-iotests/004 | 2 +-
> tests/qemu-iotests/012 | 2 +-
> tests/qemu-iotests/048 | 22 +++++++++++++++-------
> tests/qemu-iotests/048.out | 6 ++++--
> tests/qemu-iotests/052 | 4 ++++
> tests/qemu-iotests/052.out | 4 ++++
> tests/qemu-iotests/100 | 7 +++++++
> tests/qemu-iotests/100.out | 14 ++++++++++++++
> tests/qemu-iotests/common | 7 +++++++
> tests/qemu-iotests/common.rc | 3 +++
> 10 files changed, 60 insertions(+), 11 deletions(-)
>
[...]
> diff --git a/tests/qemu-iotests/048 b/tests/qemu-iotests/048
> index e1eeac2..0e58364 100755
> --- a/tests/qemu-iotests/048
> +++ b/tests/qemu-iotests/048
[...]
> @@ -46,25 +46,33 @@ _compare()
> . ./common.filter
> . ./common.pattern
>
> -_supported_fmt raw qcow qcow2 qed
> +_supported_fmt raw qcow qcow2 qed luks
> _supported_proto file
> _supported_os Linux
>
> # Setup test basic parameters
> TEST_IMG2=$TEST_IMG.2
> +TEST_IMG_FILE2=$TEST_IMG_FILE.2
> CLUSTER_SIZE=4096
> -size=1024M
> +size=128M
>
> _make_test_img $size
> io_pattern write 524288 $CLUSTER_SIZE $CLUSTER_SIZE 4 45
>
> # Compare identical images
> -cp "$TEST_IMG" "${TEST_IMG2}"
> +cp "$TEST_IMG_FILE" "${TEST_IMG_FILE2}"
> _compare
> _compare -q
>
> # Compare images with different size
> -$QEMU_IMG resize -f $IMGFMT "$TEST_IMG" +512M
> +if [ "$IMGOPTSSYNTAX" = "true" ]; then
> + $QEMU_IMG resize $QEMU_IMG_EXTRA_ARGS "$TEST_IMG" +32M
> +else
> + $QEMU_IMG resize -f $IMGFMT "$TEST_IMG" +32M
If you don't decide to pass QEMU_IMG_EXTRA_ARGS in the
_qemu_img_wrapper, maybe you could set it to "-f $IMGFMT" if
$IMGOPTSSYNTAX is false.
(Keeping this as it is won't stop me from giving an R-b, though.)
Max
> +fi
> +# Ensure extended space is zero-initialized
> +$QEMU_IO "$TEST_IMG" -c "write -P 0 $size 32M" | _filter_qemu_io
> +
> _compare
> _compare -s
>
signature.asc
Description: OpenPGP digital signature