(Merge into prior patch.)

Notes: I don't quite like this change, but I'm at a loss for what would
be cleaner. This is a funky test.

Signed-off-by: John Snow <jsnow@redhat.com>
---
 tests/qemu-iotests/149 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/qemu-iotests/149 b/tests/qemu-iotests/149
index 9bb96d6a1d..2ae318f16f 100755
--- a/tests/qemu-iotests/149
+++ b/tests/qemu-iotests/149
@@ -295,7 +295,8 @@ def qemu_io_write_pattern(config, pattern, offset_mb, size_mb, dev=False):
     args = ["-c", "write -P 0x%x %dM %dM" % (pattern, offset_mb, size_mb)]
     args.extend(qemu_io_image_args(config, dev))
     iotests.log("qemu-io " + " ".join(args), filters=[iotests.filter_test_dir])
-    iotests.log(check_cipher_support(config, iotests.qemu_io(*args)),
+    output = iotests.qemu_io(*args, check=False).stdout
+    iotests.log(check_cipher_support(config, output),
                 filters=[iotests.filter_test_dir, iotests.filter_qemu_io])
 
 
@@ -307,7 +308,8 @@ def qemu_io_read_pattern(config, pattern, offset_mb, size_mb, dev=False):
     args = ["-c", "read -P 0x%x %dM %dM" % (pattern, offset_mb, size_mb)]
     args.extend(qemu_io_image_args(config, dev))
     iotests.log("qemu-io " + " ".join(args), filters=[iotests.filter_test_dir])
-    iotests.log(check_cipher_support(config, iotests.qemu_io(*args)),
+    output = iotests.qemu_io(*args, check=False).stdout
+    iotests.log(check_cipher_support(config, output),
                 filters=[iotests.filter_test_dir, iotests.filter_qemu_io])
 
 
-- 
2.34.1

On 18.03.22 21:36, John Snow wrote:
> (Merge into prior patch.)
>
> Notes: I don't quite like this change, but I'm at a loss for what would
> be cleaner. This is a funky test.
>
> Signed-off-by: John Snow <jsnow@redhat.com>
> ---
>   tests/qemu-iotests/149 | 6 ++++--
>   1 file changed, 4 insertions(+), 2 deletions(-)

I mean, looks fine to me, fwiw.

Hanna

> diff --git a/tests/qemu-iotests/149 b/tests/qemu-iotests/149
> index 9bb96d6a1d..2ae318f16f 100755
> --- a/tests/qemu-iotests/149
> +++ b/tests/qemu-iotests/149
> @@ -295,7 +295,8 @@ def qemu_io_write_pattern(config, pattern, offset_mb, size_mb, dev=False):
>       args = ["-c", "write -P 0x%x %dM %dM" % (pattern, offset_mb, size_mb)]
>       args.extend(qemu_io_image_args(config, dev))
>       iotests.log("qemu-io " + " ".join(args), filters=[iotests.filter_test_dir])
> -    iotests.log(check_cipher_support(config, iotests.qemu_io(*args)),
> +    output = iotests.qemu_io(*args, check=False).stdout
> +    iotests.log(check_cipher_support(config, output),
>                   filters=[iotests.filter_test_dir, iotests.filter_qemu_io])
>   
>   
> @@ -307,7 +308,8 @@ def qemu_io_read_pattern(config, pattern, offset_mb, size_mb, dev=False):
>       args = ["-c", "read -P 0x%x %dM %dM" % (pattern, offset_mb, size_mb)]
>       args.extend(qemu_io_image_args(config, dev))
>       iotests.log("qemu-io " + " ".join(args), filters=[iotests.filter_test_dir])
> -    iotests.log(check_cipher_support(config, iotests.qemu_io(*args)),
> +    output = iotests.qemu_io(*args, check=False).stdout
> +    iotests.log(check_cipher_support(config, output),
>                   filters=[iotests.filter_test_dir, iotests.filter_qemu_io])
>   
>