diff options
| author | John Snow <jsnow@redhat.com> | 2022-04-18 17:14:53 -0400 |
|---|---|---|
| committer | Hanna Reitz <hreitz@redhat.com> | 2022-04-25 14:30:02 +0200 |
| commit | 093a13acbf6be15de01cbf4afc27fb4193fd49ee (patch) | |
| tree | 4afe5d96afac29bcfbe3fae34250f9e0cbe1e09d | |
| parent | 80dd5aff1b3273e0ee5bec379df62647c0b39c1c (diff) | |
| download | qemu-093a13acbf6be15de01cbf4afc27fb4193fd49ee.zip qemu-093a13acbf6be15de01cbf4afc27fb4193fd49ee.tar.gz qemu-093a13acbf6be15de01cbf4afc27fb4193fd49ee.tar.bz2 | |
iotests: replace calls to log(qemu_io(...)) with qemu_io_log()
This makes these callsites a little simpler, but the real motivation is
a forthcoming commit will change the return type of qemu_io(), so removing
users of the return value now is helpful.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
Message-Id: <20220418211504.943969-2-jsnow@redhat.com>
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
| -rwxr-xr-x | tests/qemu-iotests/242 | 6 | ||||
| -rwxr-xr-x | tests/qemu-iotests/255 | 4 | ||||
| -rwxr-xr-x | tests/qemu-iotests/303 | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/tests/qemu-iotests/242 b/tests/qemu-iotests/242 index b3afd36..c89f0c6 100755 --- a/tests/qemu-iotests/242 +++ b/tests/qemu-iotests/242 @@ -22,8 +22,8 @@ import iotests import json import struct -from iotests import qemu_img_create, qemu_io, qemu_img_info, \ - file_path, img_info_log, log, filter_qemu_io +from iotests import qemu_img_create, qemu_io_log, qemu_img_info, \ + file_path, img_info_log, log iotests.script_initialize(supported_fmts=['qcow2'], supported_protocols=['file'], @@ -61,7 +61,7 @@ def add_bitmap(bitmap_number, persistent, disabled): def write_to_disk(offset, size): write = 'write {} {}'.format(offset, size) - log(qemu_io('-c', write, disk), filters=[filter_qemu_io]) + qemu_io_log('-c', write, disk) def toggle_flag(offset): diff --git a/tests/qemu-iotests/255 b/tests/qemu-iotests/255 index f86fa85..88b29d6 100755 --- a/tests/qemu-iotests/255 +++ b/tests/qemu-iotests/255 @@ -95,9 +95,7 @@ with iotests.FilePath('src.qcow2') as src_path, \ iotests.qemu_img_create('-f', iotests.imgfmt, src_path, size_str) iotests.qemu_img_create('-f', iotests.imgfmt, dst_path, size_str) - iotests.log(iotests.qemu_io('-f', iotests.imgfmt, '-c', 'write 0 1M', - src_path), - filters=[iotests.filter_test_dir, iotests.filter_qemu_io]) + iotests.qemu_io_log('-f', iotests.imgfmt, '-c', 'write 0 1M', src_path), vm.add_object('throttle-group,x-bps-read=4096,id=throttle0') diff --git a/tests/qemu-iotests/303 b/tests/qemu-iotests/303 index 40e947f..a8cc6a2 100755 --- a/tests/qemu-iotests/303 +++ b/tests/qemu-iotests/303 @@ -21,7 +21,7 @@ import iotests import subprocess -from iotests import qemu_img_create, qemu_io, file_path, log, filter_qemu_io, \ +from iotests import qemu_img_create, qemu_io_log, file_path, log, \ verify_qcow2_zstd_compression iotests.script_initialize(supported_fmts=['qcow2'], @@ -45,7 +45,7 @@ def create_bitmap(bitmap_number, disabled): def write_to_disk(offset, size): write = f'write {offset} {size}' - log(qemu_io('-c', write, disk), filters=[filter_qemu_io]) + qemu_io_log('-c', write, disk) def add_bitmap(num, begin, end, disabled): |