iotest: Fix filtering order in 226

[Qemu-devel] [PATCH] iotest: Fix filtering order in 226

Posted by Max Reitz 7 years, 3 months ago

The test directory should be filtered before the image format, otherwise
the test will fail if the image format is part of the test directory,
like so:

[...]
-can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory
+can't open: Could not open '/tmp/test-IMGFMT/t.IMGFMT': Is a directory
[...]

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

diff --git a/tests/qemu-iotests/226 b/tests/qemu-iotests/226
index 460aea2fc9..a5a1f6720a 100755
--- a/tests/qemu-iotests/226
+++ b/tests/qemu-iotests/226
@@ -52,10 +52,10 @@ for PROTO in "file" "host_device" "host_cdrom"; do
     echo "=== Testing with driver:$PROTO ==="
     echo
     echo "== Testing RO =="
-    $QEMU_IO -c "open -r -o driver=$PROTO,filename=$TEST_IMG" 2>&1 | _filter_imgfmt | _filter_testdir
+    $QEMU_IO -c "open -r -o driver=$PROTO,filename=$TEST_IMG" 2>&1 | _filter_testdir | _filter_imgfmt
     $QEMU_IO -c "open -r -o driver=$PROTO,filename=/dev/null" 2>&1 | _filter_imgfmt
     echo "== Testing RW =="
-    $QEMU_IO -c "open -o driver=$PROTO,filename=$TEST_IMG" 2>&1 | _filter_imgfmt | _filter_testdir
+    $QEMU_IO -c "open -o driver=$PROTO,filename=$TEST_IMG" 2>&1 | _filter_testdir | _filter_imgfmt
     $QEMU_IO -c "open -o driver=$PROTO,filename=/dev/null" 2>&1 | _filter_imgfmt
 done
 
-- 
2.17.1

Re: [Qemu-devel] [PATCH] iotest: Fix filtering order in 226

Posted by John Snow 7 years, 3 months ago


On 07/13/2018 03:41 PM, Max Reitz wrote:
> The test directory should be filtered before the image format, otherwise
> the test will fail if the image format is part of the test directory,
> like so:
> 
> [...]
> -can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory
> +can't open: Could not open '/tmp/test-IMGFMT/t.IMGFMT': Is a directory
> [...]
> 
> Signed-off-by: Max Reitz <mreitz@redhat.com>

Too many gotchas in our test suite.

Thanks :(

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

Re: [Qemu-devel] [PATCH] iotest: Fix filtering order in 226

Posted by Kevin Wolf 7 years, 3 months ago

Am 13.07.2018 um 22:14 hat John Snow geschrieben:
> 
> 
> On 07/13/2018 03:41 PM, Max Reitz wrote:
> > The test directory should be filtered before the image format, otherwise
> > the test will fail if the image format is part of the test directory,
> > like so:
> > 
> > [...]
> > -can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory
> > +can't open: Could not open '/tmp/test-IMGFMT/t.IMGFMT': Is a directory
> > [...]
> > 
> > Signed-off-by: Max Reitz <mreitz@redhat.com>
> 
> Too many gotchas in our test suite.
> 
> Thanks :(

Maybe we should start writing tests for our tests? ;-)

Thanks, applied to the block branch.

Kevin