diff options
| author | John Snow <jsnow@redhat.com> | 2022-03-21 16:16:13 -0400 |
|---|---|---|
| committer | Hanna Reitz <hreitz@redhat.com> | 2022-03-22 10:14:37 +0100 |
| commit | 88baae552dad5c0b91973cae16b0f4a927129f51 (patch) | |
| tree | 349630ac411e66b850562e63852380ca3089b51f /tests/qemu-iotests/149 | |
| parent | 3d53818ff70ebbb09288c494080cf6717e1713ce (diff) | |
| download | qemu-88baae552dad5c0b91973cae16b0f4a927129f51.zip qemu-88baae552dad5c0b91973cae16b0f4a927129f51.tar.gz qemu-88baae552dad5c0b91973cae16b0f4a927129f51.tar.bz2 | |
iotests/149: Remove qemu_img_pipe() call
qemu_img_pipe calls blank their output when the command being run is a
'create' call and the command succeeds. Thus, the normative output for
this command in iotest 149 is to print a blank line. We can remove the
logging from this invocation and use a checked invocation, but we still
need to inspect the actual output to see if we want to retroactively
skip the test due to missing cipher support.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
Message-Id: <20220321201618.903471-14-jsnow@redhat.com>
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
Diffstat (limited to 'tests/qemu-iotests/149')
| -rwxr-xr-x | tests/qemu-iotests/149 | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/qemu-iotests/149 b/tests/qemu-iotests/149 index d49646c..9bb96d6 100755 --- a/tests/qemu-iotests/149 +++ b/tests/qemu-iotests/149 @@ -265,8 +265,11 @@ def qemu_img_create(config, size_mb): "%dM" % size_mb] iotests.log("qemu-img " + " ".join(args), filters=[iotests.filter_test_dir]) - iotests.log(check_cipher_support(config, iotests.qemu_img_pipe(*args)), - filters=[iotests.filter_test_dir]) + try: + iotests.qemu_img(*args) + except subprocess.CalledProcessError as exc: + check_cipher_support(config, exc.output) + raise def qemu_io_image_args(config, dev=False): """Get the args for access an image or device with qemu-io""" |