[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 16/18] iotests: remove qemu_img_pipe()
From: |
John Snow |
Subject: |
[PATCH v2 16/18] iotests: remove qemu_img_pipe() |
Date: |
Mon, 21 Feb 2022 17:34:11 -0500 |
With the exceptional 'create' calls removed in the prior commit, change
qemu_img_log() and img_info_log() to call qemu_img() directly
instead.
In keeping with the spirit of diff-based tests, allow these calls to
qemu_img() to return an unchecked non-zero status code -- because any
error we'd see from the output is going into the log anyway.
Every last call to qemu-img is now either checked for a return code of
zero or has its output logged. It should be very hard to accidentally
ignore the return code *or* output from qemu-img now; intentional malice
remains unhandled.
Signed-off-by: John Snow <jsnow@redhat.com>
---
tests/qemu-iotests/iotests.py | 26 +++++++-------------------
1 file changed, 7 insertions(+), 19 deletions(-)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 16bac5df969..6da6890596c 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -240,15 +240,6 @@ def qemu_img_create_prepare_args(args: List[str]) ->
List[str]:
return result
-def qemu_img_pipe_and_status(*args: str) -> Tuple[str, int]:
- """
- Run qemu-img and return both its output and its exit code
- """
- is_create = bool(args and args[0] == 'create')
- full_args = qemu_img_args + qemu_img_create_prepare_args(list(args))
- return qemu_tool_pipe_and_status('qemu-img', full_args,
- drop_successful_output=is_create)
-
def qemu_img(*args: str, check: bool = True, combine_stdio: bool = True
) -> subprocess.CompletedProcess[str]:
"""
@@ -356,17 +347,14 @@ 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_pipe(*args: str) -> str:
- '''Run qemu-img and return its output'''
- return qemu_img_pipe_and_status(*args)[0]
-
-def qemu_img_log(*args):
- result = qemu_img_pipe(*args)
- log(result, filters=[filter_testfiles])
+def qemu_img_log(*args: str) -> subprocess.CompletedProcess[str]:
+ result = qemu_img(*args, check=False)
+ log(result.stdout, filters=[filter_testfiles])
return result
-def img_info_log(filename, filter_path=None, use_image_opts=False,
- extra_args=()):
+def img_info_log(filename: str, filter_path: Optional[str] = None,
+ use_image_opts: bool = False, extra_args: Sequence[str] = (),
+ ) -> None:
args = ['info']
if use_image_opts:
args.append('--image-opts')
@@ -375,7 +363,7 @@ def img_info_log(filename, filter_path=None,
use_image_opts=False,
args += extra_args
args.append(filename)
- output = qemu_img_pipe(*args)
+ output = qemu_img(*args, check=False).stdout
if not filter_path:
filter_path = filename
log(filter_img_info(output, filter_path))
--
2.34.1
- [PATCH v2 04/18] iotests: make qemu_img raise on non-zero rc by default, (continued)
- [PATCH v2 04/18] iotests: make qemu_img raise on non-zero rc by default, John Snow, 2022/02/21
- [PATCH v2 07/18] iotests: use qemu_img_json() when applicable, John Snow, 2022/02/21
- [PATCH v2 08/18] iotests: add qemu_img_info(), John Snow, 2022/02/21
- [PATCH v2 09/18] iotests: remove-bitmap-from-backing: use qemu_img_info(), John Snow, 2022/02/21
- [PATCH v2 10/18] iotests: add qemu_img_map() function, John Snow, 2022/02/21
- [PATCH v2 11/18] iotests: change supports_quorum to use qemu_img, John Snow, 2022/02/21
- [PATCH v2 12/18] iotests: replace unchecked calls to qemu_img_pipe(), John Snow, 2022/02/21
- [PATCH v2 13/18] iotests: remove external calls to qemu_img_pipe(), John Snow, 2022/02/21
- [PATCH v2 14/18] iotests: move has_working_luks onto qemu_img(), John Snow, 2022/02/21
- [PATCH v2 15/18] iotests: remove qemu_img_log('create', ...) calls, John Snow, 2022/02/21
- [PATCH v2 16/18] iotests: remove qemu_img_pipe(),
John Snow <=
- [PATCH v2 18/18] iotests: reimplement img_info_log in terms of qemu_img_log, John Snow, 2022/02/21
- [PATCH v2 17/18] iotests: make qemu_img_log() check log level, John Snow, 2022/02/21