aboutsummaryrefslogtreecommitdiff
path: root/tests/qemu-iotests/095
diff options
context:
space:
mode:
authorMax Reitz <mreitz@redhat.com>2014-09-30 21:31:27 +0200
committerStefan Hajnoczi <stefanha@redhat.com>2014-10-04 19:18:17 +0100
commit1b53eab270ee08e61e21c3fcc77e34c4b5484c30 (patch)
tree3301cfaf58974a9376a3792d3709953cf83c9a07 /tests/qemu-iotests/095
parentf5bebbbb28dc7a149a891f0f1e112fb50bb72664 (diff)
iotests: Use _img_info
qemu-img info should only be used directly if the format-specific information or the name of the format is relevant (some tests explicitly test format-specific information; test 082 uses qcow2-specific settings to test the qemu-img interface); otherwise, tests should always use _img_info instead. Test 082 was touched only partially. It does test the qemu-img interface; however, its invocations of qemu-img info are not real tests but rather verifications, so if format-specific information is not important for the test, there is no reason not to use _img_info. In contrast to directly invoking qemu-img info, "qcow2" is replaced by "IMGFMT"; but as "qcow2" is only mentioned once in test 082 (in _supported_fmt), I consider this an improvement. Signed-off-by: Max Reitz <mreitz@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-id: 1412105489-7681-2-git-send-email-mreitz@redhat.com Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'tests/qemu-iotests/095')
-rwxr-xr-xtests/qemu-iotests/0954
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/qemu-iotests/095 b/tests/qemu-iotests/095
index acc7dbf182..6630181a78 100755
--- a/tests/qemu-iotests/095
+++ b/tests/qemu-iotests/095
@@ -60,7 +60,7 @@ _make_test_img -b "${TEST_IMG}.snp1" $size_larger
echo
echo "=== Base image info before commit and resize ==="
-$QEMU_IMG info "${TEST_IMG}.base" | _filter_testdir
+TEST_IMG="${TEST_IMG}.base" _img_info
echo
echo === Running QEMU Live Commit Test ===
@@ -78,7 +78,7 @@ _send_qemu_cmd $h "{ 'execute': 'block-commit',
echo
echo "=== Base image info after commit and resize ==="
-$QEMU_IMG info "${TEST_IMG}.base" | _filter_testdir
+TEST_IMG="${TEST_IMG}.base" _img_info
# success, all done
echo "*** done"