[v1] iotests: Fix some issues

[Qemu-devel] [PATCH 3/9] iotests: Fix 232 for LUKS

Posted by Max Reitz 6 years, 9 months ago

With IMGOPTSSYNTAX, $TEST_IMG is useless for this test (it only tests
the file-posix protocol driver).  Therefore, if $TEST_IMG_FILE is set,
use that instead.

Because this test requires the file protocol, $TEST_IMG_FILE will always
be set if $IMGOPTSSYNTAX is true.

Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/232 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/qemu-iotests/232 b/tests/qemu-iotests/232
index 93e5d641a3..e48bc8f5db 100755
--- a/tests/qemu-iotests/232
+++ b/tests/qemu-iotests/232
@@ -69,6 +69,10 @@ size=128M
 
 _make_test_img $size
 
+if [ -n "$TEST_IMG_FILE" ]; then
+    TEST_IMG=$TEST_IMG_FILE
+fi
+
 echo
 echo "=== -drive with read-write image: read-only/auto-read-only combinations ==="
 echo
-- 
2.20.1

Re: [Qemu-devel] [PATCH 3/9] iotests: Fix 232 for LUKS

Posted by John Snow 6 years, 9 months ago


On 1/23/19 9:46 AM, Max Reitz wrote:
> With IMGOPTSSYNTAX, $TEST_IMG is useless for this test (it only tests
> the file-posix protocol driver).  Therefore, if $TEST_IMG_FILE is set,
> use that instead.
> 
> Because this test requires the file protocol, $TEST_IMG_FILE will always
> be set if $IMGOPTSSYNTAX is true.
> 
> Signed-off-by: Max Reitz <mreitz@redhat.com>

This keeps biting us. Or at least, it bit me once and then it has bitten
someone else. It's not obvious that you need to accommodate this when
writing a new test.

For now, anyway, this does give us a new bandaid for a while longer.

Reviewed-by: John Snow <jsnow@redhat.com>

> ---
>  tests/qemu-iotests/232 | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/tests/qemu-iotests/232 b/tests/qemu-iotests/232
> index 93e5d641a3..e48bc8f5db 100755
> --- a/tests/qemu-iotests/232
> +++ b/tests/qemu-iotests/232
> @@ -69,6 +69,10 @@ size=128M
>  
>  _make_test_img $size
>  
> +if [ -n "$TEST_IMG_FILE" ]; then
> +    TEST_IMG=$TEST_IMG_FILE
> +fi
> +
>  echo
>  echo "=== -drive with read-write image: read-only/auto-read-only combinations ==="
>  echo
> 

-- 
—js

Re: [Qemu-devel] [PATCH 3/9] iotests: Fix 232 for LUKS

Posted by Max Reitz 6 years, 9 months ago

On 29.01.19 22:26, John Snow wrote:
> 
> 
> On 1/23/19 9:46 AM, Max Reitz wrote:
>> With IMGOPTSSYNTAX, $TEST_IMG is useless for this test (it only tests
>> the file-posix protocol driver).  Therefore, if $TEST_IMG_FILE is set,
>> use that instead.
>>
>> Because this test requires the file protocol, $TEST_IMG_FILE will always
>> be set if $IMGOPTSSYNTAX is true.
>>
>> Signed-off-by: Max Reitz <mreitz@redhat.com>
> 
> This keeps biting us. Or at least, it bit me once and then it has bitten
> someone else. It's not obvious that you need to accommodate this when
> writing a new test.

No, it isn't. :-)

But I think at least me running ./check -luks from time to time should
be sufficient, usually.  It's just that I had basically given up on a
clean iotests run for a month or two now...

Max