|
 |
357786 |
From 71c378083914a8ee1c4169bc47d1a21df38a16f7 Mon Sep 17 00:00:00 2001
|
|
|
357786 |
From: Max Reitz <mreitz@redhat.com>
|
|
|
357786 |
Date: Mon, 18 Jun 2018 14:59:42 +0200
|
|
|
357786 |
Subject: [PATCH 08/89] iotests: Test help option for unsupporting formats
|
|
|
357786 |
|
|
|
357786 |
RH-Author: Max Reitz <mreitz@redhat.com>
|
|
|
357786 |
Message-id: <20180618145943.4489-7-mreitz@redhat.com>
|
|
|
357786 |
Patchwork-id: 80760
|
|
|
357786 |
O-Subject: [RHV-7.6 qemu-kvm-rhev PATCH 6/7] iotests: Test help option for unsupporting formats
|
|
|
357786 |
Bugzilla: 1537956
|
|
|
357786 |
RH-Acked-by: John Snow <jsnow@redhat.com>
|
|
|
357786 |
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
357786 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
357786 |
|
|
|
357786 |
This adds test cases to 082 for qemu-img create/convert/amend "-o help"
|
|
|
357786 |
on formats that do not support creation or amendment, respectively.
|
|
|
357786 |
|
|
|
357786 |
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
|
357786 |
Reviewed-by: John Snow <jsnow@redhat.com>
|
|
|
357786 |
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
|
357786 |
Message-id: 20180509210023.20283-7-mreitz@redhat.com
|
|
|
357786 |
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
|
357786 |
(cherry picked from commit e53995eb19b546b18d1a34cd6eaa07faedbade79)
|
|
|
357786 |
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
|
357786 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
357786 |
---
|
|
|
357786 |
tests/qemu-iotests/082 | 9 +++++++++
|
|
|
357786 |
tests/qemu-iotests/082.out | 9 +++++++++
|
|
|
357786 |
2 files changed, 18 insertions(+)
|
|
|
357786 |
|
|
|
357786 |
diff --git a/tests/qemu-iotests/082 b/tests/qemu-iotests/082
|
|
|
357786 |
index d5c83d4..a872f77 100755
|
|
|
357786 |
--- a/tests/qemu-iotests/082
|
|
|
357786 |
+++ b/tests/qemu-iotests/082
|
|
|
357786 |
@@ -97,6 +97,9 @@ run_qemu_img create -f $IMGFMT -o backing_file="$TEST_IMG" -o ,, -o help "$TEST_
|
|
|
357786 |
run_qemu_img create -f $IMGFMT -o help
|
|
|
357786 |
run_qemu_img create -o help
|
|
|
357786 |
|
|
|
357786 |
+# Try help option for a format that does not support creation
|
|
|
357786 |
+run_qemu_img create -f bochs -o help
|
|
|
357786 |
+
|
|
|
357786 |
echo
|
|
|
357786 |
echo === convert: Options specified more than once ===
|
|
|
357786 |
|
|
|
357786 |
@@ -151,6 +154,9 @@ run_qemu_img convert -O $IMGFMT -o backing_file="$TEST_IMG" -o ,, -o help "$TEST
|
|
|
357786 |
run_qemu_img convert -O $IMGFMT -o help
|
|
|
357786 |
run_qemu_img convert -o help
|
|
|
357786 |
|
|
|
357786 |
+# Try help option for a format that does not support creation
|
|
|
357786 |
+run_qemu_img convert -O bochs -o help
|
|
|
357786 |
+
|
|
|
357786 |
echo
|
|
|
357786 |
echo === amend: Options specified more than once ===
|
|
|
357786 |
|
|
|
357786 |
@@ -201,6 +207,9 @@ run_qemu_img amend -f $IMGFMT -o backing_file="$TEST_IMG" -o ,, -o help "$TEST_I
|
|
|
357786 |
run_qemu_img amend -f $IMGFMT -o help
|
|
|
357786 |
run_qemu_img convert -o help
|
|
|
357786 |
|
|
|
357786 |
+# Try help option for a format that does not support amendment
|
|
|
357786 |
+run_qemu_img amend -f bochs -o help
|
|
|
357786 |
+
|
|
|
357786 |
# success, all done
|
|
|
357786 |
echo "*** done"
|
|
|
357786 |
rm -f $seq.full
|
|
|
357786 |
diff --git a/tests/qemu-iotests/082.out b/tests/qemu-iotests/082.out
|
|
|
357786 |
index 4e52dce..60ef87c 100644
|
|
|
357786 |
--- a/tests/qemu-iotests/082.out
|
|
|
357786 |
+++ b/tests/qemu-iotests/082.out
|
|
|
357786 |
@@ -249,6 +249,9 @@ Testing: create -o help
|
|
|
357786 |
Supported options:
|
|
|
357786 |
size Virtual disk size
|
|
|
357786 |
|
|
|
357786 |
+Testing: create -f bochs -o help
|
|
|
357786 |
+qemu-img: Format driver 'bochs' does not support image creation
|
|
|
357786 |
+
|
|
|
357786 |
=== convert: Options specified more than once ===
|
|
|
357786 |
|
|
|
357786 |
Testing: create -f qcow2 TEST_DIR/t.qcow2 128M
|
|
|
357786 |
@@ -502,6 +505,9 @@ Testing: convert -o help
|
|
|
357786 |
Supported options:
|
|
|
357786 |
size Virtual disk size
|
|
|
357786 |
|
|
|
357786 |
+Testing: convert -O bochs -o help
|
|
|
357786 |
+qemu-img: Format driver 'bochs' does not support image creation
|
|
|
357786 |
+
|
|
|
357786 |
=== amend: Options specified more than once ===
|
|
|
357786 |
|
|
|
357786 |
Testing: amend -f foo -f qcow2 -o lazy_refcounts=on TEST_DIR/t.qcow2
|
|
|
357786 |
@@ -763,4 +769,7 @@ Note that not all of these options may be amendable.
|
|
|
357786 |
Testing: convert -o help
|
|
|
357786 |
Supported options:
|
|
|
357786 |
size Virtual disk size
|
|
|
357786 |
+
|
|
|
357786 |
+Testing: amend -f bochs -o help
|
|
|
357786 |
+qemu-img: Format driver 'bochs' does not support option amendment
|
|
|
357786 |
*** done
|
|
|
357786 |
--
|
|
|
357786 |
1.8.3.1
|
|
|
357786 |
|