[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 15/18] iotests: use qemu_img() in has_working_luks()
From: |
John Snow |
Subject: |
[PATCH v4 15/18] iotests: use qemu_img() in has_working_luks() |
Date: |
Thu, 17 Mar 2022 19:49:34 -0400 |
Admittedly a mostly lateral move, but qemu_img() is essentially the
replacement for qemu_img_pipe_and_status(). It will give slightly better
diagnostics on crash.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
---
tests/qemu-iotests/iotests.py | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 17065fc176..8491ff0477 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -1444,20 +1444,20 @@ def has_working_luks() -> Tuple[bool, str]:
"""
img_file = f'{test_dir}/luks-test.luks'
- (output, status) = \
- qemu_img_pipe_and_status('create', '-f', 'luks',
- '--object', luks_default_secret_object,
- '-o', luks_default_key_secret_opt,
- '-o', 'iter-time=10',
- img_file, '1G')
+ res = qemu_img('create', '-f', 'luks',
+ '--object', luks_default_secret_object,
+ '-o', luks_default_key_secret_opt,
+ '-o', 'iter-time=10',
+ img_file, '1G',
+ check=False)
try:
os.remove(img_file)
except OSError:
pass
- if status != 0:
- reason = output
- for line in output.splitlines():
+ if res.returncode:
+ reason = res.stdout
+ for line in res.stdout.splitlines():
if img_file + ':' in line:
reason = line.split(img_file + ':', 1)[1].strip()
break
--
2.34.1
- [PATCH v4 03/18] iotests: Remove explicit checks for qemu_img() == 0, (continued)
- [PATCH v4 03/18] iotests: Remove explicit checks for qemu_img() == 0, John Snow, 2022/03/17
- [PATCH v4 02/18] python/utils: add VerboseProcessError, John Snow, 2022/03/17
- [PATCH v4 05/18] iotests: fortify compare_images() against crashes, John Snow, 2022/03/17
- [PATCH v4 06/18] iotests: add qemu_img_json(), John Snow, 2022/03/17
- [PATCH v4 08/18] iotests: add qemu_img_info(), John Snow, 2022/03/17
- [PATCH v4 07/18] iotests: use qemu_img_json() when applicable, John Snow, 2022/03/17
- [PATCH v4 10/18] iotests: add qemu_img_map() function, John Snow, 2022/03/17
- [PATCH v4 15/18] iotests: use qemu_img() in has_working_luks(),
John Snow <=
- [PATCH v4 01/18] python/utils: add add_visual_margin() text decoration utility, John Snow, 2022/03/17
- [PATCH v4 09/18] iotests/remove-bitmap-from-backing: use qemu_img_info(), John Snow, 2022/03/17
- [PATCH v4 12/18] iotests: replace unchecked calls to qemu_img_pipe(), John Snow, 2022/03/17
- [PATCH v4 18/18] iotests: make qemu_img_log and img_info_log raise on error, John Snow, 2022/03/17
- [PATCH v4 04/18] iotests: make qemu_img raise on non-zero rc by default, John Snow, 2022/03/17
- [PATCH v4 17/18] iotests: remove qemu_img_pipe_and_status(), John Snow, 2022/03/17
- [PATCH v4 16/18] iotests: replace qemu_img_log('create', ...) calls, John Snow, 2022/03/17
- [PATCH v4 11/18] iotests: change supports_quorum to use qemu_img, John Snow, 2022/03/17
- [PATCH v4 13/18] iotests/149: Remove qemu_img_pipe() call, John Snow, 2022/03/17
- [PATCH v4 14/18] iotests: remove remaining calls to qemu_img_pipe(), John Snow, 2022/03/17