[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 18/18] iotests: reimplement img_info_log in terms of qemu_img_
From: |
John Snow |
Subject: |
[PATCH v2 18/18] iotests: reimplement img_info_log in terms of qemu_img_log |
Date: |
Mon, 21 Feb 2022 17:34:13 -0500 |
Now every last call to qemu_img is certifiably either checked or logged.
Signed-off-by: John Snow <jsnow@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
- [PATCH v2 07/18] iotests: use qemu_img_json() when applicable, (continued)
- [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, 2022/02/21
- [PATCH v2 18/18] iotests: reimplement img_info_log in terms of qemu_img_log,
John Snow <=
- [PATCH v2 17/18] iotests: make qemu_img_log() check log level, John Snow, 2022/02/21