From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>, Eric Blake <eblake@redhat.com>,
Hanna Reitz <hreitz@redhat.com>, John Snow <jsnow@redhat.com>,
qemu-block@nongnu.org
Subject: [PATCH v3 12/12] iotests: make qemu_io_log() check return codes by default
Date: Mon, 18 Apr 2022 17:15:04 -0400 [thread overview]
Message-ID: <20220418211504.943969-13-jsnow@redhat.com> (raw)
In-Reply-To: <20220418211504.943969-1-jsnow@redhat.com>
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 1d103a38722..1a3662db0b1 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 8be721a24fb..d0b401b0602 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
next prev parent reply other threads:[~2022-04-18 21:32 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-18 21:14 [PATCH v3 00/12] iotests: add enhanced debugging info to qemu-io failures John Snow
2022-04-18 21:14 ` [PATCH v3 01/12] iotests: replace calls to log(qemu_io(...)) with qemu_io_log() John Snow
2022-04-18 21:14 ` [PATCH v3 02/12] iotests/163: Fix broken qemu-io invocation John Snow
2022-04-18 21:14 ` [PATCH v3 03/12] iotests: Don't check qemu_io() output for specific error strings John Snow
2022-04-18 21:14 ` [PATCH v3 04/12] iotests/040: Don't check image pattern on zero-length image John Snow
2022-04-18 21:14 ` [PATCH v3 05/12] iotests/040: Fix TestCommitWithFilters test John Snow
2022-04-18 21:14 ` [PATCH v3 06/12] iotests: create generic qemu_tool() function John Snow
2022-04-18 21:14 ` [PATCH v3 07/12] iotests: rebase qemu_io() on top of qemu_tool() John Snow
2022-04-19 19:19 ` Eric Blake
2022-04-18 21:15 ` [PATCH v3 08/12] iotests/migration-permissions: use assertRaises() for qemu_io() negative test John Snow
2022-04-18 21:15 ` [PATCH v3 09/12] iotests/image-fleecing: switch to qemu_io() John Snow
2022-04-18 21:15 ` [PATCH v3 10/12] iotests: remove qemu_io_pipe_and_status() John Snow
2022-04-18 21:15 ` [PATCH v3 11/12] iotests: remove qemu_io_silent() and qemu_io_silent_check() John Snow
2022-04-18 21:15 ` John Snow [this message]
2022-04-25 12:31 ` [PATCH v3 00/12] iotests: add enhanced debugging info to qemu-io failures Hanna Reitz
2022-04-26 16:40 ` John Snow
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220418211504.943969-13-jsnow@redhat.com \
--to=jsnow@redhat.com \
--cc=eblake@redhat.com \
--cc=hreitz@redhat.com \
--cc=kwolf@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).