On Tue, Mar 22, 2022, 12:30 PM Hanna Reitz <hreitz@redhat.com> wrote:
On 18.03.22 21:36, John Snow wrote:
> (Merge with prior patch.)
>
> Signed-off-by: John Snow <jsnow@redhat.com>
> ---
> tests/qemu-iotests/242 | 2 +-
> tests/qemu-iotests/245 | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tests/qemu-iotests/242 b/tests/qemu-iotests/242
> index 4b7ec16af6..ecc851582a 100755
> --- a/tests/qemu-iotests/242
> +++ b/tests/qemu-iotests/242
> @@ -22,7 +22,7 @@
> import iotests
> import json
> import struct
> -from iotests import qemu_img_create, qemu_io, qemu_img_info, \
> +from iotests import qemu_img_create, qemu_io_log, qemu_img_info, \
> file_path, img_info_log, log, filter_qemu_io
>
> iotests.script_initialize(supported_fmts=['qcow2'],
> diff --git a/tests/qemu-iotests/245 b/tests/qemu-iotests/245
> index 8cbed7821b..efdad1a0c4 100755
> --- a/tests/qemu-iotests/245
> +++ b/tests/qemu-iotests/245
> @@ -217,7 +217,7 @@ class TestBlockdevReopen(iotests.QMPTestCase):
> # Reopen an image several times changing some of its options
> def test_reopen(self):
> # Check whether the filesystem supports O_DIRECT
> - if 'O_DIRECT' in qemu_io('-f', 'raw', '-t', 'none',
'-c', 'quit', hd_path[0]):
> + if 'O_DIRECT' in qemu_io('-f', 'raw', '-t', 'none',
'-c', 'quit', hd_path[0]).stdout:
This is to verify that O_DIRECT works or not. If it doesn’t work,
this
will fail, so we need to pass check=False here.
(Or this test fails on tmpfs.)
Hanna
Oh, I didn't realize a solitary "quit" command could still fail.
Thanks for the tip.