|
 |
383d26 |
From 97f1ac94b611b8e6c319696ac8a92aded5395ef5 Mon Sep 17 00:00:00 2001
|
|
|
383d26 |
From: John Snow <jsnow@redhat.com>
|
|
|
383d26 |
Date: Wed, 20 Mar 2019 17:12:05 +0100
|
|
|
383d26 |
Subject: [PATCH 034/163] iotest: Fix filtering order in 226
|
|
|
383d26 |
|
|
|
383d26 |
RH-Author: John Snow <jsnow@redhat.com>
|
|
|
383d26 |
Message-id: <20190320171206.19236-2-jsnow@redhat.com>
|
|
|
383d26 |
Patchwork-id: 84960
|
|
|
383d26 |
O-Subject: [RHEL-7.7 qemu-kvm-rhev PATCH 1/2] iotest: Fix filtering order in 226
|
|
|
383d26 |
Bugzilla: 1691018
|
|
|
383d26 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
383d26 |
RH-Acked-by: Stefano Garzarella <sgarzare@redhat.com>
|
|
|
383d26 |
RH-Acked-by: Sergio Lopez Pascual <slp@redhat.com>
|
|
|
383d26 |
|
|
|
383d26 |
From: Max Reitz <mreitz@redhat.com>
|
|
|
383d26 |
|
|
|
383d26 |
The test directory should be filtered before the image format, otherwise
|
|
|
383d26 |
the test will fail if the image format is part of the test directory,
|
|
|
383d26 |
like so:
|
|
|
383d26 |
|
|
|
383d26 |
[...]
|
|
|
383d26 |
-can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory
|
|
|
383d26 |
+can't open: Could not open '/tmp/test-IMGFMT/t.IMGFMT': Is a directory
|
|
|
383d26 |
[...]
|
|
|
383d26 |
|
|
|
383d26 |
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
|
383d26 |
Reviewed-by: John Snow <jsnow@redhat.com>
|
|
|
383d26 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
383d26 |
(cherry picked from commit d6e4ca902148f33cfaf117396f57c7fff7c635f0)
|
|
|
383d26 |
Signed-off-by: John Snow <jsnow@redhat.com>
|
|
|
383d26 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
383d26 |
---
|
|
|
383d26 |
tests/qemu-iotests/226 | 4 ++--
|
|
|
383d26 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
383d26 |
|
|
|
383d26 |
diff --git a/tests/qemu-iotests/226 b/tests/qemu-iotests/226
|
|
|
383d26 |
index 460aea2..a5a1f67 100755
|
|
|
383d26 |
--- a/tests/qemu-iotests/226
|
|
|
383d26 |
+++ b/tests/qemu-iotests/226
|
|
|
383d26 |
@@ -52,10 +52,10 @@ for PROTO in "file" "host_device" "host_cdrom"; do
|
|
|
383d26 |
echo "=== Testing with driver:$PROTO ==="
|
|
|
383d26 |
echo
|
|
|
383d26 |
echo "== Testing RO =="
|
|
|
383d26 |
- $QEMU_IO -c "open -r -o driver=$PROTO,filename=$TEST_IMG" 2>&1 | _filter_imgfmt | _filter_testdir
|
|
|
383d26 |
+ $QEMU_IO -c "open -r -o driver=$PROTO,filename=$TEST_IMG" 2>&1 | _filter_testdir | _filter_imgfmt
|
|
|
383d26 |
$QEMU_IO -c "open -r -o driver=$PROTO,filename=/dev/null" 2>&1 | _filter_imgfmt
|
|
|
383d26 |
echo "== Testing RW =="
|
|
|
383d26 |
- $QEMU_IO -c "open -o driver=$PROTO,filename=$TEST_IMG" 2>&1 | _filter_imgfmt | _filter_testdir
|
|
|
383d26 |
+ $QEMU_IO -c "open -o driver=$PROTO,filename=$TEST_IMG" 2>&1 | _filter_testdir | _filter_imgfmt
|
|
|
383d26 |
$QEMU_IO -c "open -o driver=$PROTO,filename=/dev/null" 2>&1 | _filter_imgfmt
|
|
|
383d26 |
done
|
|
|
383d26 |
|
|
|
383d26 |
--
|
|
|
383d26 |
1.8.3.1
|
|
|
383d26 |
|