yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
Pablo Greco e6a3ae
From 5e41ecd75bc95d1390328218676c72ac1cf4562b Mon Sep 17 00:00:00 2001
Pablo Greco e6a3ae
From: Pino Toscano <ptoscano@redhat.com>
Pablo Greco e6a3ae
Date: Mon, 8 Jul 2019 15:25:54 +0100
Pablo Greco e6a3ae
Subject: [PATCH 08/39] qemu-iotests: Fix paths for NFS
Pablo Greco e6a3ae
MIME-Version: 1.0
Pablo Greco e6a3ae
Content-Type: text/plain; charset=UTF-8
Pablo Greco e6a3ae
Content-Transfer-Encoding: 8bit
Pablo Greco e6a3ae
Pablo Greco e6a3ae
RH-Author: Pino Toscano <ptoscano@redhat.com>
Pablo Greco e6a3ae
Message-id: <20190708152601.21123-4-ptoscano@redhat.com>
Pablo Greco e6a3ae
Patchwork-id: 89423
Pablo Greco e6a3ae
O-Subject: [RHEL-8.1.0 qemu-kvm PATCH v3 03/10] qemu-iotests: Fix paths for NFS
Pablo Greco e6a3ae
Bugzilla: 1513367
Pablo Greco e6a3ae
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Pablo Greco e6a3ae
RH-Acked-by: Max Reitz <mreitz@redhat.com>
Pablo Greco e6a3ae
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
Pablo Greco e6a3ae
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
Pablo Greco e6a3ae
Pablo Greco e6a3ae
From: Kevin Wolf <kwolf@redhat.com>
Pablo Greco e6a3ae
Pablo Greco e6a3ae
Test cases were trying to use nfs:// URLs as local filenames, which made
Pablo Greco e6a3ae
every test fail for NFS. With TEST_IMG and TEST_IMG_FILE set like for
Pablo Greco e6a3ae
the other protocols, NFS tests can pass again.
Pablo Greco e6a3ae
Pablo Greco e6a3ae
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Pablo Greco e6a3ae
Reviewed-by: Fam Zheng <famz@redhat.com>
Pablo Greco e6a3ae
(cherry picked from commit 655ae6bb91998a01964759406cb38ef215a6ba5b)
Pablo Greco e6a3ae
Signed-off-by: Pino Toscano <ptoscano@redhat.com>
Pablo Greco e6a3ae
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
Pablo Greco e6a3ae
---
Pablo Greco e6a3ae
 tests/qemu-iotests/common.rc | 4 ++--
Pablo Greco e6a3ae
 1 file changed, 2 insertions(+), 2 deletions(-)
Pablo Greco e6a3ae
Pablo Greco e6a3ae
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
Pablo Greco e6a3ae
index 9a65a11..cb5fa14 100644
Pablo Greco e6a3ae
--- a/tests/qemu-iotests/common.rc
Pablo Greco e6a3ae
+++ b/tests/qemu-iotests/common.rc
Pablo Greco e6a3ae
@@ -147,8 +147,8 @@ else
Pablo Greco e6a3ae
         TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT
Pablo Greco e6a3ae
         TEST_IMG="ssh://127.0.0.1$TEST_IMG_FILE"
Pablo Greco e6a3ae
     elif [ "$IMGPROTO" = "nfs" ]; then
Pablo Greco e6a3ae
-        TEST_DIR="nfs://127.0.0.1/$TEST_DIR"
Pablo Greco e6a3ae
-        TEST_IMG=$TEST_DIR/t.$IMGFMT
Pablo Greco e6a3ae
+        TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT
Pablo Greco e6a3ae
+        TEST_IMG="nfs://127.0.0.1$TEST_IMG_FILE"
Pablo Greco e6a3ae
     elif [ "$IMGPROTO" = "vxhs" ]; then
Pablo Greco e6a3ae
         TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT
Pablo Greco e6a3ae
         TEST_IMG="vxhs://127.0.0.1:9999/t.$IMGFMT"
Pablo Greco e6a3ae
-- 
Pablo Greco e6a3ae
1.8.3.1
Pablo Greco e6a3ae