[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 20/25] iotests: use qemu_img() in has_working_luks()
From: |
Hanna Reitz |
Subject: |
[PULL 20/25] iotests: use qemu_img() in has_working_luks() |
Date: |
Tue, 22 Mar 2022 12:56:42 +0100 |
From: John Snow <jsnow@redhat.com>
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>
Message-Id: <20220321201618.903471-16-jsnow@redhat.com>
Signed-off-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 aaf4da8be4..d006f56127 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -1445,20 +1445,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.35.1
- [PULL 09/25] iotests: make qemu_img raise on non-zero rc by default, (continued)
- [PULL 09/25] iotests: make qemu_img raise on non-zero rc by default, Hanna Reitz, 2022/03/22
- [PULL 11/25] iotests: add qemu_img_json(), Hanna Reitz, 2022/03/22
- [PULL 10/25] iotests: fortify compare_images() against crashes, Hanna Reitz, 2022/03/22
- [PULL 12/25] iotests: use qemu_img_json() when applicable, Hanna Reitz, 2022/03/22
- [PULL 13/25] iotests: add qemu_img_info(), Hanna Reitz, 2022/03/22
- [PULL 14/25] iotests/remove-bitmap-from-backing: use qemu_img_info(), Hanna Reitz, 2022/03/22
- [PULL 16/25] iotests: change supports_quorum to use qemu_img, Hanna Reitz, 2022/03/22
- [PULL 17/25] iotests: replace unchecked calls to qemu_img_pipe(), Hanna Reitz, 2022/03/22
- [PULL 18/25] iotests/149: Remove qemu_img_pipe() call, Hanna Reitz, 2022/03/22
- [PULL 21/25] iotests: replace qemu_img_log('create', ...) calls, Hanna Reitz, 2022/03/22
- [PULL 20/25] iotests: use qemu_img() in has_working_luks(),
Hanna Reitz <=
- [PULL 19/25] iotests: remove remaining calls to qemu_img_pipe(), Hanna Reitz, 2022/03/22
- [PULL 22/25] iotests: remove qemu_img_pipe_and_status(), Hanna Reitz, 2022/03/22
- [PULL 23/25] iotests: make qemu_img_log and img_info_log raise on error, Hanna Reitz, 2022/03/22
- [PULL 24/25] iotests.py: Filters for VM.run_job(), Hanna Reitz, 2022/03/22
- [PULL 25/25] iotests/207: Filter host fingerprint, Hanna Reitz, 2022/03/22
- [PULL 15/25] iotests: add qemu_img_map() function, Hanna Reitz, 2022/03/22
- Re: [PULL 00/25] Block patches for 7.0-rc1, Peter Maydell, 2022/03/22