[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 17/17] iotests: make qemu_io_log() check return codes by defau
From: |
John Snow |
Subject: |
[PATCH v2 17/17] iotests: make qemu_io_log() check return codes by default |
Date: |
Thu, 24 Mar 2022 14:30:18 -0400 |
Just like qemu_img_log(), upgrade qemu_io_log() to enforce a return code
of zero by default.
Tests that use qemu_io_log(): 242 245 255 274 303 307 nbd-reconnect-on-open
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
---
tests/qemu-iotests/iotests.py | 5 +++--
tests/qemu-iotests/tests/nbd-reconnect-on-open | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 1d103a3872..1a3662db0b 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -365,8 +365,9 @@ def qemu_io(*args: str, check: bool = True, combine_stdio:
bool = True
return qemu_tool(*qemu_io_wrap_args(args),
check=check, combine_stdio=combine_stdio)
-def qemu_io_log(*args: str) -> 'subprocess.CompletedProcess[str]':
- result = qemu_io(*args, check=False)
+def qemu_io_log(*args: str, check: bool = True
+ ) -> 'subprocess.CompletedProcess[str]':
+ result = qemu_io(*args, check=check)
log(result.stdout, filters=[filter_testfiles, filter_qemu_io])
return result
diff --git a/tests/qemu-iotests/tests/nbd-reconnect-on-open
b/tests/qemu-iotests/tests/nbd-reconnect-on-open
index 8be721a24f..d0b401b060 100755
--- a/tests/qemu-iotests/tests/nbd-reconnect-on-open
+++ b/tests/qemu-iotests/tests/nbd-reconnect-on-open
@@ -39,7 +39,7 @@ def check_fail_to_connect(open_timeout):
log(f'Check fail to connect with {open_timeout} seconds of timeout')
start_t = time.time()
- qemu_io_log(*create_args(open_timeout))
+ qemu_io_log(*create_args(open_timeout), check=False)
delta_t = time.time() - start_t
max_delta = open_timeout + 0.2
--
2.34.1
- [PATCH v2 08/17] iotests/030: fixup, (continued)
- [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, 2022/03/24
- [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 <=
- [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
- [PATCH v2 10/17] iotests/205: fixup, John Snow, 2022/03/24
- [PATCH v2 15/17] iotests: remove qemu_io_pipe_and_status(), John Snow, 2022/03/24