diff options
| author | Max Reitz <mreitz@redhat.com> | 2019-04-13 17:20:36 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2019-04-30 15:29:00 +0200 |
| commit | 0ef5a8e6ceb06205b96201b469748409a47f5b89 (patch) | |
| tree | f7ae7fe74175227062783bdbce0a44430a7a443a | |
| parent | 718c0fce2f56755a8d8f737607779a98aa6e7cc4 (diff) | |
| download | qemu-0ef5a8e6ceb06205b96201b469748409a47f5b89.zip qemu-0ef5a8e6ceb06205b96201b469748409a47f5b89.tar.gz qemu-0ef5a8e6ceb06205b96201b469748409a47f5b89.tar.bz2 | |
iotests: Perform the correct test in 082
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>
| -rwxr-xr-x | tests/qemu-iotests/082 | 5 | ||||
| -rw-r--r-- | tests/qemu-iotests/082.out | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/tests/qemu-iotests/082 b/tests/qemu-iotests/082 index d0afa46..278511d 100755 --- a/tests/qemu-iotests/082 +++ b/tests/qemu-iotests/082 @@ -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 diff --git a/tests/qemu-iotests/082.out b/tests/qemu-iotests/082.out index d36938d..9a23b68 100644 --- a/tests/qemu-iotests/082.out +++ b/tests/qemu-iotests/082.out @@ -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 |