From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>, Beraldo Leal <bleal@redhat.com>,
qemu-block@nongnu.org, John Snow <jsnow@redhat.com>,
Hanna Reitz <hreitz@redhat.com>, Cleber Rosa <crosa@redhat.com>,
Eric Blake <eblake@redhat.com>
Subject: [PATCH v4 02/18] python/utils: add VerboseProcessError
Date: Thu, 17 Mar 2022 19:49:21 -0400 [thread overview]
Message-ID: <20220317234937.569525-3-jsnow@redhat.com> (raw)
In-Reply-To: <20220317234937.569525-1-jsnow@redhat.com>
This adds an Exception that extends the Python stdlib
subprocess.CalledProcessError.
The difference is that the str() method of this exception also adds the
stdout/stderr logs. In effect, if this exception goes unhandled, Python
will print the output in a visually distinct wrapper to the terminal so
that it's easy to spot in a sea of traceback information.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
---
python/qemu/utils/__init__.py | 39 +++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
diff --git a/python/qemu/utils/__init__.py b/python/qemu/utils/__init__.py
index 5babf40df2..904eb0de33 100644
--- a/python/qemu/utils/__init__.py
+++ b/python/qemu/utils/__init__.py
@@ -18,6 +18,7 @@
import os
import re
import shutil
+from subprocess import CalledProcessError
import textwrap
from typing import Optional
@@ -26,6 +27,7 @@
__all__ = (
+ 'VerboseProcessError',
'add_visual_margin',
'get_info_usernet_hostfwd_port',
'kvm_available',
@@ -121,3 +123,40 @@ def _wrap(line: str) -> str:
os.linesep.join(_wrap(line) for line in content.splitlines()),
_bar(None, top=False),
))
+
+
+class VerboseProcessError(CalledProcessError):
+ """
+ The same as CalledProcessError, but more verbose.
+
+ This is useful for debugging failed calls during test executions.
+ The return code, signal (if any), and terminal output will be displayed
+ on unhandled exceptions.
+ """
+ def summary(self) -> str:
+ """Return the normal CalledProcessError str() output."""
+ return super().__str__()
+
+ def __str__(self) -> str:
+ lmargin = ' '
+ width = -len(lmargin)
+ sections = []
+
+ # Does self.stdout contain both stdout and stderr?
+ has_combined_output = self.stderr is None
+
+ name = 'output' if has_combined_output else 'stdout'
+ if self.stdout:
+ sections.append(add_visual_margin(self.stdout, width, name))
+ else:
+ sections.append(f"{name}: N/A")
+
+ if self.stderr:
+ sections.append(add_visual_margin(self.stderr, width, 'stderr'))
+ elif not has_combined_output:
+ sections.append("stderr: N/A")
+
+ return os.linesep.join((
+ self.summary(),
+ textwrap.indent(os.linesep.join(sections), prefix=lmargin),
+ ))
--
2.34.1
next prev parent reply other threads:[~2022-03-17 23:54 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-17 23:49 [PATCH v4 00/18] iotests: add enhanced debugging info to qemu-img failures John Snow
2022-03-17 23:49 ` [PATCH v4 01/18] python/utils: add add_visual_margin() text decoration utility John Snow
2022-03-17 23:49 ` John Snow [this message]
2022-03-17 23:49 ` [PATCH v4 03/18] iotests: Remove explicit checks for qemu_img() == 0 John Snow
2022-03-17 23:49 ` [PATCH v4 04/18] iotests: make qemu_img raise on non-zero rc by default John Snow
2022-03-17 23:49 ` [PATCH v4 05/18] iotests: fortify compare_images() against crashes John Snow
2022-03-17 23:49 ` [PATCH v4 06/18] iotests: add qemu_img_json() John Snow
2022-03-21 13:40 ` Eric Blake
2022-03-17 23:49 ` [PATCH v4 07/18] iotests: use qemu_img_json() when applicable John Snow
2022-03-17 23:49 ` [PATCH v4 08/18] iotests: add qemu_img_info() John Snow
2022-03-17 23:49 ` [PATCH v4 09/18] iotests/remove-bitmap-from-backing: use qemu_img_info() John Snow
2022-03-17 23:49 ` [PATCH v4 10/18] iotests: add qemu_img_map() function John Snow
2022-03-21 14:24 ` Eric Blake
2022-03-21 16:15 ` John Snow
2022-03-17 23:49 ` [PATCH v4 11/18] iotests: change supports_quorum to use qemu_img John Snow
2022-03-17 23:49 ` [PATCH v4 12/18] iotests: replace unchecked calls to qemu_img_pipe() John Snow
2022-03-17 23:49 ` [PATCH v4 13/18] iotests/149: Remove qemu_img_pipe() call John Snow
2022-03-17 23:49 ` [PATCH v4 14/18] iotests: remove remaining calls to qemu_img_pipe() John Snow
2022-03-17 23:49 ` [PATCH v4 15/18] iotests: use qemu_img() in has_working_luks() John Snow
2022-03-17 23:49 ` [PATCH v4 16/18] iotests: replace qemu_img_log('create', ...) calls John Snow
2022-03-17 23:49 ` [PATCH v4 17/18] iotests: remove qemu_img_pipe_and_status() John Snow
2022-03-17 23:49 ` [PATCH v4 18/18] iotests: make qemu_img_log and img_info_log raise on error John Snow
2022-03-18 13:35 ` [PATCH v4 00/18] iotests: add enhanced debugging info to qemu-img failures Hanna Reitz
2022-03-18 15:08 ` John Snow
2022-03-18 16:38 ` Hanna Reitz
2022-03-18 21:14 ` John Snow
2022-03-21 13:14 ` Hanna Reitz
2022-03-21 15:50 ` Hanna Reitz
2022-03-21 16:23 ` John Snow
2022-03-21 16:26 ` Hanna Reitz
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=20220317234937.569525-3-jsnow@redhat.com \
--to=jsnow@redhat.com \
--cc=bleal@redhat.com \
--cc=crosa@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.