From 97f1ac94b611b8e6c319696ac8a92aded5395ef5 Mon Sep 17 00:00:00 2001 From: John Snow Date: Wed, 20 Mar 2019 17:12:05 +0100 Subject: [PATCH 034/163] iotest: Fix filtering order in 226 RH-Author: John Snow Message-id: <20190320171206.19236-2-jsnow@redhat.com> Patchwork-id: 84960 O-Subject: [RHEL-7.7 qemu-kvm-rhev PATCH 1/2] iotest: Fix filtering order in 226 Bugzilla: 1691018 RH-Acked-by: Stefan Hajnoczi RH-Acked-by: Stefano Garzarella RH-Acked-by: Sergio Lopez Pascual From: Max Reitz 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 Reviewed-by: John Snow Signed-off-by: Kevin Wolf (cherry picked from commit d6e4ca902148f33cfaf117396f57c7fff7c635f0) Signed-off-by: John Snow Signed-off-by: Miroslav Rezanina --- 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 460aea2..a5a1f67 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 -- 1.8.3.1