From 065df0fad17065597ffb3baf5b697c82c95c2ed0 Mon Sep 17 00:00:00 2001

From: Pino Toscano <ptoscano@redhat.com>

Date: Mon, 8 Jul 2019 15:25:55 +0100

Subject: [PATCH 09/39] qemu-iotests: Filter NFS paths

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

RH-Author: Pino Toscano <ptoscano@redhat.com>

Message-id: <20190708152601.21123-5-ptoscano@redhat.com>

Patchwork-id: 89419

O-Subject: [RHEL-8.1.0 qemu-kvm PATCH v3 04/10] qemu-iotests: Filter NFS paths

Bugzilla: 1513367

RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>

RH-Acked-by: Max Reitz <mreitz@redhat.com>

RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>

RH-Acked-by: Markus Armbruster <armbru@redhat.com>

From: Kevin Wolf <kwolf@redhat.com>

NFS paths were only partially filtered in _filter_img_create, _img_info

and _filter_img_info, resulting in "nfs://127.0.0.1TEST_DIR/t.IMGFMT".

This adds another replacement to the sed calls that matches the test

directory not as a host path, but as an NFS URL (the prefix as used for

$TEST_IMG).

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

Reviewed-by: Fam Zheng <famz@redhat.com>

(cherry picked from commit 8908b253c4ad5f8874c8d13abec169c696a5cd32)

Signed-off-by: Pino Toscano <ptoscano@redhat.com>

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 tests/qemu-iotests/126.out       | 2 +-

 tests/qemu-iotests/common.filter | 6 ++++--

 tests/qemu-iotests/common.rc     | 8 +++++++-

 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/tests/qemu-iotests/126.out b/tests/qemu-iotests/126.out

index 50d7308..17d03d5 100644

--- a/tests/qemu-iotests/126.out

+++ b/tests/qemu-iotests/126.out

@@ -3,7 +3,7 @@ QA output created by 126

 === Testing plain files ===

 Formatting 'TEST_DIR/a:b.IMGFMT', fmt=IMGFMT size=67108864

-Formatting 'TEST_DIR/a:b.IMGFMT', fmt=IMGFMT size=67108864

+Formatting 'file:TEST_DIR/a:b.IMGFMT', fmt=IMGFMT size=67108864

 === Testing relative backing filename resolution ===

diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter

index 7acb454..2031e35 100644

--- a/tests/qemu-iotests/common.filter

+++ b/tests/qemu-iotests/common.filter

@@ -118,7 +118,8 @@ _filter_actual_image_size()

 # replace driver-specific options in the "Formatting..." line

 _filter_img_create()

 {

-    sed -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" \

+    sed -e "s#$REMOTE_TEST_DIR#TEST_DIR#g" \

+        -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" \

         -e "s#$TEST_DIR#TEST_DIR#g" \

         -e "s#$IMGFMT#IMGFMT#g" \

         -e 's#nbd:127.0.0.1:10810#TEST_DIR/t.IMGFMT#g' \

@@ -153,7 +154,8 @@ _filter_img_info()

     discard=0

     regex_json_spec_start='^ *"format-specific": \{'

-    sed -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" \

+    sed -e "s#$REMOTE_TEST_DIR#TEST_DIR#g" \

+        -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" \

         -e "s#$TEST_DIR#TEST_DIR#g" \

         -e "s#$IMGFMT#IMGFMT#g" \

         -e 's#nbd://127.0.0.1:10810$#TEST_DIR/t.IMGFMT#g' \

diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc

index cb5fa14..d054cb9 100644

--- a/tests/qemu-iotests/common.rc

+++ b/tests/qemu-iotests/common.rc

@@ -148,6 +148,7 @@ else

         TEST_IMG="ssh://127.0.0.1$TEST_IMG_FILE"

     elif [ "$IMGPROTO" = "nfs" ]; then

         TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT

+        REMOTE_TEST_DIR="nfs://127.0.0.1$TEST_DIR"

         TEST_IMG="nfs://127.0.0.1$TEST_IMG_FILE"

     elif [ "$IMGPROTO" = "vxhs" ]; then

         TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT

@@ -173,6 +174,10 @@ if [ ! -d "$TEST_DIR" ]; then

     exit 1

 fi

+if [ -z "$REMOTE_TEST_DIR" ]; then

+    REMOTE_TEST_DIR="$TEST_DIR"

+fi

+

 if [ ! -d "$SAMPLE_IMG_DIR" ]; then

     echo "common.config: Error: \$SAMPLE_IMG_DIR ($SAMPLE_IMG_DIR) is not a directory"

     exit 1

@@ -333,7 +338,8 @@ _img_info()

     discard=0

     regex_json_spec_start='^ *"format-specific": \{'

     $QEMU_IMG info $QEMU_IMG_EXTRA_ARGS "$@" "$TEST_IMG" 2>&1 | \

-        sed -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" \

+        sed -e "s#$REMOTE_TEST_DIR#TEST_DIR#g" \

+            -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" \

             -e "s#$TEST_DIR#TEST_DIR#g" \

             -e "s#$IMGFMT#IMGFMT#g" \

             -e "/^disk size:/ D" \

-- 

1.8.3.1