[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 17/18] iotests: make qemu_img_log() check log level
From: |
John Snow |
Subject: |
[PATCH v2 17/18] iotests: make qemu_img_log() check log level |
Date: |
Mon, 21 Feb 2022 17:34:12 -0500 |
Improve qemu_img_log() to actually check if logging is turned on. If it
isn't, revert to the behavior of qemu_img(). This is done so that there
really is no way to avoid scrutinizing qemu-ing subprocess calls by
accident. You're gonna have to work for it.
Signed-off-by: John Snow <jsnow@redhat.com>
---
tests/qemu-iotests/iotests.py | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 6da6890596c..0519b2a8019 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -348,7 +348,13 @@ def qemu_img_map(*args: str) -> Any:
return qemu_img_json('map', "--output", "json", *args)
def qemu_img_log(*args: str) -> subprocess.CompletedProcess[str]:
- result = qemu_img(*args, check=False)
+ """
+ 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.
+ """
+ result = qemu_img(*args, check=not logging_enabled())
log(result.stdout, filters=[filter_testfiles])
return result
@@ -1635,6 +1641,11 @@ def activate_logging():
test_logger.setLevel(logging.INFO)
test_logger.propagate = False
+def logging_enabled() -> bool:
+ """Return True if iotest logging is active."""
+ return (test_logger.hasHandlers()
+ and test_logger.getEffectiveLevel() >= logging.INFO)
+
# This is called from script-style iotests without a single point of entry
def script_initialize(*args, **kwargs):
"""Initialize script-style tests without running any tests."""
--
2.34.1
- [PATCH v2 08/18] iotests: add qemu_img_info(), (continued)
- [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, 2022/02/21
- [PATCH v2 17/18] iotests: make qemu_img_log() check log level,
John Snow <=