aboutsummaryrefslogtreecommitdiff
path: root/tests/qemu-iotests/065
diff options
context:
space:
mode:
authorJohn Snow <jsnow@redhat.com>2022-03-21 16:16:08 -0400
committerHanna Reitz <hreitz@redhat.com>2022-03-22 10:14:31 +0100
commit9ebb2b765b0d6c6fd5228a736e31acfc10a56315 (patch)
tree9956298a213712d79f739ec51209b3505711329c /tests/qemu-iotests/065
parent0f7d7d72aa99c8e48bbbf37262a9c66c83113f76 (diff)
iotests: add qemu_img_info()
Add qemu_img_info() by analogy with qemu_img_measure() and qemu_img_check(). Modify image_size() to use this function instead to take advantage of the better diagnostic information on failure provided (ultimately) by qemu_img(). Signed-off-by: John Snow <jsnow@redhat.com> Reviewed-by: Hanna Reitz <hreitz@redhat.com> Message-Id: <20220321201618.903471-9-jsnow@redhat.com> Signed-off-by: Hanna Reitz <hreitz@redhat.com>
Diffstat (limited to 'tests/qemu-iotests/065')
-rwxr-xr-xtests/qemu-iotests/0655
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/qemu-iotests/065 b/tests/qemu-iotests/065
index f7c1b68dad..9466ce7df4 100755
--- a/tests/qemu-iotests/065
+++ b/tests/qemu-iotests/065
@@ -24,7 +24,7 @@ import os
import re
import json
import iotests
-from iotests import qemu_img, qemu_img_pipe
+from iotests import qemu_img, qemu_img_info, qemu_img_pipe
import unittest
test_img = os.path.join(iotests.test_dir, 'test.img')
@@ -49,8 +49,7 @@ class TestQemuImgInfo(TestImageInfoSpecific):
human_compare = None
def test_json(self):
- data = json.loads(qemu_img_pipe('info', '--output=json', test_img))
- data = data['format-specific']
+ data = qemu_img_info(test_img)['format-specific']
self.assertEqual(data['type'], iotests.imgfmt)
self.assertEqual(data['data'], self.json_compare)