* [Qemu-devel] [PATCH 0/3] qemu-iotests: Fix NFS + raw
@ 2018-05-17 16:52 Kevin Wolf
2018-05-17 16:52 ` [Qemu-devel] [PATCH 1/3] qemu-iotests: Fix paths for NFS Kevin Wolf
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Kevin Wolf @ 2018-05-17 16:52 UTC (permalink / raw)
To: qemu-block; +Cc: kwolf, qemu-devel
This series fixes the NFS support in qemu-iotests, at least as far as
raw is concerned. More fixes would be needed for NFS with qcow2.
Kevin Wolf (3):
qemu-iotests: Fix paths for NFS
qemu-iotests: Filter NFS paths
qemu-iotests: 086 doesn't work with NFS
tests/qemu-iotests/086 | 2 +-
tests/qemu-iotests/common.filter | 6 ++++--
tests/qemu-iotests/common.rc | 7 ++++---
3 files changed, 9 insertions(+), 6 deletions(-)
--
2.13.6
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Qemu-devel] [PATCH 1/3] qemu-iotests: Fix paths for NFS
2018-05-17 16:52 [Qemu-devel] [PATCH 0/3] qemu-iotests: Fix NFS + raw Kevin Wolf
@ 2018-05-17 16:52 ` Kevin Wolf
2018-05-17 16:52 ` [Qemu-devel] [PATCH 2/3] qemu-iotests: Filter NFS paths Kevin Wolf
2018-05-17 16:52 ` [Qemu-devel] [PATCH 3/3] qemu-iotests: 086 doesn't work with NFS Kevin Wolf
2 siblings, 0 replies; 5+ messages in thread
From: Kevin Wolf @ 2018-05-17 16:52 UTC (permalink / raw)
To: qemu-block; +Cc: kwolf, qemu-devel
Test cases were trying to use nfs:// URLs as local filenames, which made
every test fail for NFS. With TEST_IMG and TEST_IMG_FILE set like for
the other protocols, NFS tests can pass again.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
tests/qemu-iotests/common.rc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index 9a65a11026..cb5fa14e7f 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -147,8 +147,8 @@ else
TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT
TEST_IMG="ssh://127.0.0.1$TEST_IMG_FILE"
elif [ "$IMGPROTO" = "nfs" ]; then
- TEST_DIR="nfs://127.0.0.1/$TEST_DIR"
- TEST_IMG=$TEST_DIR/t.$IMGFMT
+ TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT
+ TEST_IMG="nfs://127.0.0.1$TEST_IMG_FILE"
elif [ "$IMGPROTO" = "vxhs" ]; then
TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT
TEST_IMG="vxhs://127.0.0.1:9999/t.$IMGFMT"
--
2.13.6
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Qemu-devel] [PATCH 2/3] qemu-iotests: Filter NFS paths
2018-05-17 16:52 [Qemu-devel] [PATCH 0/3] qemu-iotests: Fix NFS + raw Kevin Wolf
2018-05-17 16:52 ` [Qemu-devel] [PATCH 1/3] qemu-iotests: Fix paths for NFS Kevin Wolf
@ 2018-05-17 16:52 ` Kevin Wolf
2018-05-18 8:42 ` Kevin Wolf
2018-05-17 16:52 ` [Qemu-devel] [PATCH 3/3] qemu-iotests: 086 doesn't work with NFS Kevin Wolf
2 siblings, 1 reply; 5+ messages in thread
From: Kevin Wolf @ 2018-05-17 16:52 UTC (permalink / raw)
To: qemu-block; +Cc: kwolf, qemu-devel
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 $TEST_IMG as
a whole.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
tests/qemu-iotests/common.filter | 6 ++++--
tests/qemu-iotests/common.rc | 3 ++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter
index c5f4bcf578..ae83591337 100644
--- a/tests/qemu-iotests/common.filter
+++ b/tests/qemu-iotests/common.filter
@@ -119,7 +119,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#$TEST_IMG#TEST_DIR/t.IMGFMT#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' \
@@ -154,7 +155,8 @@ _filter_img_info()
discard=0
regex_json_spec_start='^ *"format-specific": \{'
- sed -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" \
+ sed -e "s#$TEST_IMG#TEST_DIR/t.IMGFMT#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 cb5fa14e7f..a055d8b032 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -333,7 +333,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#$TEST_IMG#TEST_DIR/t.IMGFMT#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" \
--
2.13.6
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Qemu-devel] [PATCH 3/3] qemu-iotests: 086 doesn't work with NFS
2018-05-17 16:52 [Qemu-devel] [PATCH 0/3] qemu-iotests: Fix NFS + raw Kevin Wolf
2018-05-17 16:52 ` [Qemu-devel] [PATCH 1/3] qemu-iotests: Fix paths for NFS Kevin Wolf
2018-05-17 16:52 ` [Qemu-devel] [PATCH 2/3] qemu-iotests: Filter NFS paths Kevin Wolf
@ 2018-05-17 16:52 ` Kevin Wolf
2 siblings, 0 replies; 5+ messages in thread
From: Kevin Wolf @ 2018-05-17 16:52 UTC (permalink / raw)
To: qemu-block; +Cc: kwolf, qemu-devel
The reference output file only works for file. 'qemu-img convert -p'
makes a lot more progress updates for NFS than for file, so disable the
test for NFS.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
tests/qemu-iotests/086 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/qemu-iotests/086 b/tests/qemu-iotests/086
index cd4494a660..84e3835071 100755
--- a/tests/qemu-iotests/086
+++ b/tests/qemu-iotests/086
@@ -38,7 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
. ./common.filter
_supported_fmt qcow2 raw
-_supported_proto file nfs
+_supported_proto file
_supported_os Linux
function run_qemu_img()
--
2.13.6
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH 2/3] qemu-iotests: Filter NFS paths
2018-05-17 16:52 ` [Qemu-devel] [PATCH 2/3] qemu-iotests: Filter NFS paths Kevin Wolf
@ 2018-05-18 8:42 ` Kevin Wolf
0 siblings, 0 replies; 5+ messages in thread
From: Kevin Wolf @ 2018-05-18 8:42 UTC (permalink / raw)
To: qemu-block; +Cc: qemu-devel
Am 17.05.2018 um 18:52 hat Kevin Wolf geschrieben:
> 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 $TEST_IMG as
> a whole.
>
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Self-NACK, this replaces a bit too much... (Some places in the test
scripts override $TEST_IMG, but not $TEST_IMG_FILE).
Maybe we need to introduce some $TEST_DIR_REMOTE (any suggestions for
a better name?) that would contain "nfs://127.0.0.1$TEST_DIR" and can be
used in the filter function.
Kevin
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-05-18 8:42 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-17 16:52 [Qemu-devel] [PATCH 0/3] qemu-iotests: Fix NFS + raw Kevin Wolf
2018-05-17 16:52 ` [Qemu-devel] [PATCH 1/3] qemu-iotests: Fix paths for NFS Kevin Wolf
2018-05-17 16:52 ` [Qemu-devel] [PATCH 2/3] qemu-iotests: Filter NFS paths Kevin Wolf
2018-05-18 8:42 ` Kevin Wolf
2018-05-17 16:52 ` [Qemu-devel] [PATCH 3/3] qemu-iotests: 086 doesn't work with NFS Kevin Wolf
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.