Skip to content

Commit

Permalink
iotests: use qemu_img() in has_working_luks()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
jnsnow authored and XanClic committed Mar 22, 2022
1 parent 4cf661f commit 97576f8
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions tests/qemu-iotests/iotests.py
Expand Up @@ -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
Expand Down

0 comments on commit 97576f8

Please sign in to comment.