From 6c12604a55612176da194ca1654fee901fa1ba23 Mon Sep 17 00:00:00 2001

From: Max Reitz <mreitz@redhat.com>

Date: Mon, 18 Jun 2018 14:59:43 +0200

Subject: [PATCH 070/268] iotests: Rework 113

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

Message-id: <20180618145943.4489-8-mreitz@redhat.com>

Patchwork-id: 80757

O-Subject: [RHV-7.6 qemu-kvm-rhev PATCH 7/7] iotests: Rework 113

Bugzilla: 1537956

RH-Acked-by: John Snow <jsnow@redhat.com>

RH-Acked-by: Kevin Wolf <kwolf@redhat.com>

RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>

This test case has been broken since 398e6ad014df261d (roughly half a

year).  qemu-img amend requires its output image to be R/W, so it opens

it as such; the node is then turned into an read-only node automatically

which is now accompanied by a warning, however.  This warning has not

been part of the reference output.

For one thing, this warning shows that we cannot keep the test case as

it is.  We would need a format that has no create_opts but that does

have write support -- we do not have such a format, though.

Another thing is that qemu now actually checks whether an image format

supports amendment instead of whether it has create_opts (since the

former always implies the latter).  So we can now use any format that

does not support amendment (even if it supports creation) and thus test

the same code path.

The reason nobody has noticed the breakage until now of course is the

fact that nobody runs the iotests for nbd+bochs.  There actually was

never any reason to set the protocol to "nbd" but because that was

technically correct; functionally it made no difference.  So that is the

first thing we are going to change: Make the protocol "file" instead so

that people might actually notice breakage here.

Secondly, now that bochs no longer works for the amend test case, we

have to change the format there anyway.  Set let us just bend the truth

a bit, declare this test a raw test.  In fact, that does not even

concern the bochs test cases, other than the output now reading 'bochs'

instead of 'IMGFMT'.

So with this test now being a raw test, we can rework the amend test

case to use raw instead.

Signed-off-by: Max Reitz <mreitz@redhat.com>

Reviewed-by: John Snow <jsnow@redhat.com>

Message-id: 20180509210023.20283-8-mreitz@redhat.com

Signed-off-by: Max Reitz <mreitz@redhat.com>

(cherry picked from commit dee6ddd8a6b7978d0bc8ef8e1f006282ce30e4fa)

Signed-off-by: Max Reitz <mreitz@redhat.com>

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 tests/qemu-iotests/113     | 19 +++++++++----------

 tests/qemu-iotests/113.out |  7 ++++---

 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/tests/qemu-iotests/113 b/tests/qemu-iotests/113

index 19b68b2..4e09810 100755

--- a/tests/qemu-iotests/113

+++ b/tests/qemu-iotests/113

@@ -38,16 +38,17 @@ trap "_cleanup; exit \$status" 0 1 2 3 15

 . ./common.rc

 . ./common.filter

-# We can only test one format here because we need its sample file

-_supported_fmt bochs

-_supported_proto nbd

+# Some of these test cases use bochs, but others do use raw, so this

+# is only half a lie.

+_supported_fmt raw

+_supported_proto file

 _supported_os Linux

 echo

 echo '=== Unsupported image creation in qemu-img create ==='

 echo

-$QEMU_IMG create -f $IMGFMT nbd://example.com 2>&1 64M | _filter_imgfmt

+$QEMU_IMG create -f bochs nbd://example.com 2>&1 64M

 echo

 echo '=== Unsupported image creation in qemu-img convert ==='

@@ -56,17 +57,15 @@ echo

 # We could use any input image format here, but this is a bochs test, so just

 # use the bochs image

 _use_sample_img empty.bochs.bz2

-$QEMU_IMG convert -f $IMGFMT -O $IMGFMT "$TEST_IMG" nbd://example.com 2>&1 \

-    | _filter_imgfmt

+$QEMU_IMG convert -f bochs -O bochs "$TEST_IMG" nbd://example.com

 echo

 echo '=== Unsupported format in qemu-img amend ==='

 echo

-# The protocol does not matter here

-_use_sample_img empty.bochs.bz2

-$QEMU_IMG amend -f $IMGFMT -o foo=bar "$TEST_IMG" 2>&1 | _filter_imgfmt

-

+TEST_IMG="$TEST_DIR/t.$IMGFMT"

+_make_test_img 1M

+$QEMU_IMG amend -f $IMGFMT -o size=2M "$TEST_IMG" 2>&1 | _filter_imgfmt

 # success, all done

 echo

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

index 00bdfd6..3557e2b 100644

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

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

@@ -2,14 +2,15 @@ QA output created by 113

 === Unsupported image creation in qemu-img create ===

-qemu-img: nbd://example.com: Format driver 'IMGFMT' does not support image creation

+qemu-img: nbd://example.com: Format driver 'bochs' does not support image creation

 === Unsupported image creation in qemu-img convert ===

-qemu-img: Format driver 'IMGFMT' does not support image creation

+qemu-img: Format driver 'bochs' does not support image creation

 === Unsupported format in qemu-img amend ===

-qemu-img: Format driver 'IMGFMT' does not support any options to amend

+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576

+qemu-img: Format driver 'IMGFMT' does not support option amendment

 *** done

-- 

1.8.3.1