[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 09/17] iotests/149: fixup
From: |
John Snow |
Subject: |
[PATCH v2 09/17] iotests/149: fixup |
Date: |
Thu, 24 Mar 2022 14:30:10 -0400 |
(Merge into prior patch.)
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
- [PATCH v2 00/17] iotests: add enhanced debugging info to qemu-io failures, John Snow, 2022/03/24
- [PATCH v2 02/17] iotests/163: Fix broken qemu-io invocation, John Snow, 2022/03/24
- [PATCH v2 01/17] iotests: replace calls to log(qemu_io(...)) with qemu_io_log(), John Snow, 2022/03/24
- [PATCH v2 08/17] iotests/030: fixup, John Snow, 2022/03/24
- [PATCH v2 05/17] iotests/040: Fix TestCommitWithFilters test, John Snow, 2022/03/24
- [PATCH v2 04/17] iotests/040: Don't check image pattern on zero-length image, John Snow, 2022/03/24
- [PATCH v2 07/17] iotests: rebase qemu_io() on top of qemu_tool(), John Snow, 2022/03/24
- [PATCH v2 09/17] iotests/149: fixup,
John Snow <=
- [PATCH v2 12/17] iotests/migration-permissions: fixup, John Snow, 2022/03/24
- [PATCH v2 13/17] iotests/migration-permissions: use assertRaises() for qemu_io() negative test, John Snow, 2022/03/24
- [PATCH v2 17/17] iotests: make qemu_io_log() check return codes by default, John Snow, 2022/03/24
- [PATCH v2 14/17] iotests/image-fleecing: switch to qemu_io(), John Snow, 2022/03/24
- [PATCH v2 06/17] iotests: create generic qemu_tool() function, John Snow, 2022/03/24
- [PATCH v2 03/17] iotests: Don't check qemu_io() output for specific error strings, John Snow, 2022/03/24
- [PATCH v2 11/17] iotests/245: fixup, John Snow, 2022/03/24