Skip to content

Commit

Permalink
iotests: Perform the correct test in 082
Browse files Browse the repository at this point in the history
In the "amend" section of 082, we perform a single "convert" test
(namely "convert -o help").  That does not make sense, especially
because we have done exactly that "convert" test earlier in 082 already.

Replacing "convert" by "amend" yields an error, which is correct because
there is no point in "amend" having a default format.  The user has to
either specify the format, or give a file for qemu-img to probe.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
  • Loading branch information
XanClic authored and kevmw committed Apr 30, 2019
1 parent 718c0fc commit 0ef5a8e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
5 changes: 4 additions & 1 deletion tests/qemu-iotests/082
Expand Up @@ -212,7 +212,10 @@ run_qemu_img amend -f $IMGFMT -o backing_file="$TEST_IMG" -o ,, -o help "$TEST_I

# Leave out everything that isn't needed
run_qemu_img amend -f $IMGFMT -o help
run_qemu_img convert -o help

# amend requires specifying either a format explicitly, or a file
# which it can probe
run_qemu_img amend -o help

# Try help option for a format that does not support amendment
run_qemu_img amend -f bochs -o help
Expand Down
5 changes: 2 additions & 3 deletions tests/qemu-iotests/082.out
Expand Up @@ -831,9 +831,8 @@ Creation options for 'qcow2':

Note that not all of these options may be amendable.

Testing: convert -o help
Supported options:
size=<size> - Virtual disk size
Testing: amend -o help
qemu-img: Expecting one image file name

Testing: amend -f bochs -o help
qemu-img: Format driver 'bochs' does not support option amendment
Expand Down

0 comments on commit 0ef5a8e

Please sign in to comment.