On Fri, Mar 18, 2022 at 04:36:45PM -0400, John Snow wrote: > reimplement qemu_img() in terms of qemu_tool() in preparation for doing > the same with qemu_io(). > > Signed-off-by: John Snow <js...@redhat.com> > --- > tests/qemu-iotests/iotests.py | 37 +++++++++++++++++++++++------------ > 1 file changed, 24 insertions(+), 13 deletions(-) > > diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py > index 6cd8374c81..974a2b0c8d 100644 > --- a/tests/qemu-iotests/iotests.py > +++ b/tests/qemu-iotests/iotests.py > @@ -207,15 +207,13 @@ def qemu_img_create_prepare_args(args: List[str]) -> > List[str]: > > return result > > -def qemu_img(*args: str, check: bool = True, combine_stdio: bool = True > + > +def qemu_tool(*args: str, check: bool = True, combine_stdio: bool = True > ) -> subprocess.CompletedProcess[str]:
Does this line need reindentation? > @@ -227,14 +225,13 @@ def qemu_img(*args: str, check: bool = True, > combine_stdio: bool = True > handled, the command-line, return code, and all console output > will be included at the bottom of the stack trace. > > - :return: a CompletedProcess. This object has args, returncode, and > - stdout properties. If streams are not combined, it will also > - have a stderr property. > + :return: > + A CompletedProcess. This object has args, returncode, and stdout > + properties. If streams are not combined, it will also have a > + stderr property. Should this reflow be squashed in some earlier patch? As those are both cosemetic only, Reviewed-by: Eric Blake <ebl...@redhat.com> -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org