Now every last call to qemu_img is certifiably either checked or logged. Signed-off-by: John Snow <js...@redhat.com> --- tests/qemu-iotests/iotests.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 0519b2a8019..473173324d6 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -347,15 +347,20 @@ def qemu_img_info(*args: str) -> Any: def qemu_img_map(*args: str) -> Any: return qemu_img_json('map', "--output", "json", *args) -def qemu_img_log(*args: str) -> subprocess.CompletedProcess[str]: +def qemu_img_log( + *args: str, + filters: Iterable[Callable[[str], str]] = (), +) -> subprocess.CompletedProcess[str]: """ Logged, unchecked variant of qemu_img() that allows non-zero exit codes. If logging is perceived to be disabled, this function will behave like qemu_img() and prohibit non-zero return codes. + + By default, output will be filtered through filter_testfiles(). """ result = qemu_img(*args, check=not logging_enabled()) - log(result.stdout, filters=[filter_testfiles]) + log(result.stdout, filters=filters or [filter_testfiles]) return result def img_info_log(filename: str, filter_path: Optional[str] = None, @@ -369,10 +374,11 @@ def img_info_log(filename: str, filter_path: Optional[str] = None, args += extra_args args.append(filename) - output = qemu_img(*args, check=False).stdout if not filter_path: filter_path = filename - log(filter_img_info(output, filter_path)) + qemu_img_log( + *args, + filters=[lambda output: filter_img_info(output, filter_path)]) def qemu_io_wrap_args(args: Sequence[str]) -> List[str]: if '-f' in args or '--image-opts' in args: -- 2.34.1