|
 |
b38b0f |
From 5e41ecd75bc95d1390328218676c72ac1cf4562b Mon Sep 17 00:00:00 2001
|
|
|
b38b0f |
From: Pino Toscano <ptoscano@redhat.com>
|
|
|
b38b0f |
Date: Mon, 8 Jul 2019 15:25:54 +0100
|
|
|
b38b0f |
Subject: [PATCH 08/39] qemu-iotests: Fix paths for NFS
|
|
|
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-4-ptoscano@redhat.com>
|
|
|
b38b0f |
Patchwork-id: 89423
|
|
|
b38b0f |
O-Subject: [RHEL-8.1.0 qemu-kvm PATCH v3 03/10] qemu-iotests: Fix paths for NFS
|
|
|
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 |
Test cases were trying to use nfs:// URLs as local filenames, which made
|
|
|
b38b0f |
every test fail for NFS. With TEST_IMG and TEST_IMG_FILE set like for
|
|
|
b38b0f |
the other protocols, NFS tests can pass again.
|
|
|
b38b0f |
|
|
|
b38b0f |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
b38b0f |
Reviewed-by: Fam Zheng <famz@redhat.com>
|
|
|
b38b0f |
(cherry picked from commit 655ae6bb91998a01964759406cb38ef215a6ba5b)
|
|
|
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/common.rc | 4 ++--
|
|
|
b38b0f |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
b38b0f |
|
|
|
b38b0f |
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
|
|
|
b38b0f |
index 9a65a11..cb5fa14 100644
|
|
|
b38b0f |
--- a/tests/qemu-iotests/common.rc
|
|
|
b38b0f |
+++ b/tests/qemu-iotests/common.rc
|
|
|
b38b0f |
@@ -147,8 +147,8 @@ else
|
|
|
b38b0f |
TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT
|
|
|
b38b0f |
TEST_IMG="ssh://127.0.0.1$TEST_IMG_FILE"
|
|
|
b38b0f |
elif [ "$IMGPROTO" = "nfs" ]; then
|
|
|
b38b0f |
- TEST_DIR="nfs://127.0.0.1/$TEST_DIR"
|
|
|
b38b0f |
- TEST_IMG=$TEST_DIR/t.$IMGFMT
|
|
|
b38b0f |
+ TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT
|
|
|
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 |
TEST_IMG="vxhs://127.0.0.1:9999/t.$IMGFMT"
|
|
|
b38b0f |
--
|
|
|
b38b0f |
1.8.3.1
|
|
|
b38b0f |
|