|
 |
b38b0f |
From 065df0fad17065597ffb3baf5b697c82c95c2ed0 Mon Sep 17 00:00:00 2001
|
|
|
b38b0f |
From: Pino Toscano <ptoscano@redhat.com>
|
|
|
b38b0f |
Date: Mon, 8 Jul 2019 15:25:55 +0100
|
|
|
b38b0f |
Subject: [PATCH 09/39] qemu-iotests: Filter NFS paths
|
|
|
b38b0f |
MIME-Version: 1.0
|
|
|
b38b0f |
Content-Type: text/plain; charset=UTF-8
|
|
|
b38b0f |
Content-Transfer-Encoding: 8bit
|
|
|
b38b0f |
|
|
|
b38b0f |
RH-Author: Pino Toscano <ptoscano@redhat.com>
|
|
|
b38b0f |
Message-id: <20190708152601.21123-5-ptoscano@redhat.com>
|
|
|
b38b0f |
Patchwork-id: 89419
|
|
|
b38b0f |
O-Subject: [RHEL-8.1.0 qemu-kvm PATCH v3 04/10] qemu-iotests: Filter NFS paths
|
|
|
b38b0f |
Bugzilla: 1513367
|
|
|
b38b0f |
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
b38b0f |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
b38b0f |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
b38b0f |
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
|
|
|
b38b0f |
|
|
|
b38b0f |
From: Kevin Wolf <kwolf@redhat.com>
|
|
|
b38b0f |
|
|
|
b38b0f |
NFS paths were only partially filtered in _filter_img_create, _img_info
|
|
|
b38b0f |
and _filter_img_info, resulting in "nfs://127.0.0.1TEST_DIR/t.IMGFMT".
|
|
|
b38b0f |
This adds another replacement to the sed calls that matches the test
|
|
|
b38b0f |
directory not as a host path, but as an NFS URL (the prefix as used for
|
|
|
b38b0f |
$TEST_IMG).
|
|
|
b38b0f |
|
|
|
b38b0f |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
b38b0f |
Reviewed-by: Fam Zheng <famz@redhat.com>
|
|
|
b38b0f |
(cherry picked from commit 8908b253c4ad5f8874c8d13abec169c696a5cd32)
|
|
|
b38b0f |
Signed-off-by: Pino Toscano <ptoscano@redhat.com>
|
|
|
b38b0f |
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
|
b38b0f |
---
|
|
|
b38b0f |
tests/qemu-iotests/126.out | 2 +-
|
|
|
b38b0f |
tests/qemu-iotests/common.filter | 6 ++++--
|
|
|
b38b0f |
tests/qemu-iotests/common.rc | 8 +++++++-
|
|
|
b38b0f |
3 files changed, 12 insertions(+), 4 deletions(-)
|
|
|
b38b0f |
|
|
|
b38b0f |
diff --git a/tests/qemu-iotests/126.out b/tests/qemu-iotests/126.out
|
|
|
b38b0f |
index 50d7308..17d03d5 100644
|
|
|
b38b0f |
--- a/tests/qemu-iotests/126.out
|
|
|
b38b0f |
+++ b/tests/qemu-iotests/126.out
|
|
|
b38b0f |
@@ -3,7 +3,7 @@ QA output created by 126
|
|
|
b38b0f |
=== Testing plain files ===
|
|
|
b38b0f |
|
|
|
b38b0f |
Formatting 'TEST_DIR/a:b.IMGFMT', fmt=IMGFMT size=67108864
|
|
|
b38b0f |
-Formatting 'TEST_DIR/a:b.IMGFMT', fmt=IMGFMT size=67108864
|
|
|
b38b0f |
+Formatting 'file:TEST_DIR/a:b.IMGFMT', fmt=IMGFMT size=67108864
|
|
|
b38b0f |
|
|
|
b38b0f |
=== Testing relative backing filename resolution ===
|
|
|
b38b0f |
|
|
|
b38b0f |
diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter
|
|
|
b38b0f |
index 7acb454..2031e35 100644
|
|
|
b38b0f |
--- a/tests/qemu-iotests/common.filter
|
|
|
b38b0f |
+++ b/tests/qemu-iotests/common.filter
|
|
|
b38b0f |
@@ -118,7 +118,8 @@ _filter_actual_image_size()
|
|
|
b38b0f |
# replace driver-specific options in the "Formatting..." line
|
|
|
b38b0f |
_filter_img_create()
|
|
|
b38b0f |
{
|
|
|
b38b0f |
- sed -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" \
|
|
|
b38b0f |
+ sed -e "s#$REMOTE_TEST_DIR#TEST_DIR#g" \
|
|
|
b38b0f |
+ -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" \
|
|
|
b38b0f |
-e "s#$TEST_DIR#TEST_DIR#g" \
|
|
|
b38b0f |
-e "s#$IMGFMT#IMGFMT#g" \
|
|
|
b38b0f |
-e 's#nbd:127.0.0.1:10810#TEST_DIR/t.IMGFMT#g' \
|
|
|
b38b0f |
@@ -153,7 +154,8 @@ _filter_img_info()
|
|
|
b38b0f |
|
|
|
b38b0f |
discard=0
|
|
|
b38b0f |
regex_json_spec_start='^ *"format-specific": \{'
|
|
|
b38b0f |
- sed -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" \
|
|
|
b38b0f |
+ sed -e "s#$REMOTE_TEST_DIR#TEST_DIR#g" \
|
|
|
b38b0f |
+ -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" \
|
|
|
b38b0f |
-e "s#$TEST_DIR#TEST_DIR#g" \
|
|
|
b38b0f |
-e "s#$IMGFMT#IMGFMT#g" \
|
|
|
b38b0f |
-e 's#nbd://127.0.0.1:10810$#TEST_DIR/t.IMGFMT#g' \
|
|
|
b38b0f |
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
|
|
|
b38b0f |
index cb5fa14..d054cb9 100644
|
|
|
b38b0f |
--- a/tests/qemu-iotests/common.rc
|
|
|
b38b0f |
+++ b/tests/qemu-iotests/common.rc
|
|
|
b38b0f |
@@ -148,6 +148,7 @@ else
|
|
|
b38b0f |
TEST_IMG="ssh://127.0.0.1$TEST_IMG_FILE"
|
|
|
b38b0f |
elif [ "$IMGPROTO" = "nfs" ]; then
|
|
|
b38b0f |
TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT
|
|
|
b38b0f |
+ REMOTE_TEST_DIR="nfs://127.0.0.1$TEST_DIR"
|
|
|
b38b0f |
TEST_IMG="nfs://127.0.0.1$TEST_IMG_FILE"
|
|
|
b38b0f |
elif [ "$IMGPROTO" = "vxhs" ]; then
|
|
|
b38b0f |
TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT
|
|
|
b38b0f |
@@ -173,6 +174,10 @@ if [ ! -d "$TEST_DIR" ]; then
|
|
|
b38b0f |
exit 1
|
|
|
b38b0f |
fi
|
|
|
b38b0f |
|
|
|
b38b0f |
+if [ -z "$REMOTE_TEST_DIR" ]; then
|
|
|
b38b0f |
+ REMOTE_TEST_DIR="$TEST_DIR"
|
|
|
b38b0f |
+fi
|
|
|
b38b0f |
+
|
|
|
b38b0f |
if [ ! -d "$SAMPLE_IMG_DIR" ]; then
|
|
|
b38b0f |
echo "common.config: Error: \$SAMPLE_IMG_DIR ($SAMPLE_IMG_DIR) is not a directory"
|
|
|
b38b0f |
exit 1
|
|
|
b38b0f |
@@ -333,7 +338,8 @@ _img_info()
|
|
|
b38b0f |
discard=0
|
|
|
b38b0f |
regex_json_spec_start='^ *"format-specific": \{'
|
|
|
b38b0f |
$QEMU_IMG info $QEMU_IMG_EXTRA_ARGS "$@" "$TEST_IMG" 2>&1 | \
|
|
|
b38b0f |
- sed -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" \
|
|
|
b38b0f |
+ sed -e "s#$REMOTE_TEST_DIR#TEST_DIR#g" \
|
|
|
b38b0f |
+ -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" \
|
|
|
b38b0f |
-e "s#$TEST_DIR#TEST_DIR#g" \
|
|
|
b38b0f |
-e "s#$IMGFMT#IMGFMT#g" \
|
|
|
b38b0f |
-e "/^disk size:/ D" \
|
|
|
b38b0f |
--
|
|
|
b38b0f |
1.8.3.1
|
|
|
b38b0f |
|