[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 08/15] iotests/149: fixup
From: |
John Snow |
Subject: |
[PATCH 08/15] iotests/149: fixup |
Date: |
Fri, 18 Mar 2022 16:36:48 -0400 |
(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
- Re: [PATCH 05/15] iotests: create generic qemu_tool() function, (continued)
- [PATCH 06/15] iotests: rebase qemu_io() on top of qemu_tool(), John Snow, 2022/03/18
- [PATCH 13/15] iotests: remove qemu_io_pipe_and_status(), John Snow, 2022/03/18
- [PATCH 08/15] iotests/149: fixup,
John Snow <=
- [PATCH 11/15] iotests/migration-permissions: fixup, John Snow, 2022/03/18
- [PATCH 07/15] iotests/030: fixup, John Snow, 2022/03/18
- [PATCH 09/15] iotests/205: fixup, John Snow, 2022/03/18
- [PATCH 10/15] iotests/245: fixup, John Snow, 2022/03/18
- Re: [PATCH 10/15] iotests/245: fixup, John Snow, 2022/03/22