From: Thomas Huth <thuth@redhat.com>
To: "Alex Bennée" <alex.bennee@linaro.org>,
qemu-devel@nongnu.org,
"Philippe Mathieu-Daudé" <philmd@linaro.org>
Cc: Ani Sinha <anisinha@redhat.com>,
Richard Henderson <richard.henderson@linaro.org>,
Paolo Bonzini <pbonzini@redhat.com>,
"Daniel P . Berrange" <berrange@redhat.com>,
John Snow <jsnow@redhat.com>,
qemu-ppc@nongnu.org, Fabiano Rosas <farosas@suse.de>
Subject: [PATCH v2 11/23] tests/functional: Set up logging
Date: Wed, 24 Jul 2024 19:52:29 +0200 [thread overview]
Message-ID: <20240724175248.1389201-12-thuth@redhat.com> (raw)
In-Reply-To: <20240724175248.1389201-1-thuth@redhat.com>
Create log files for each test separately, one file that contains
the basic logging and one that contains the console output.
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/functional/qemu_test/__init__.py | 26 +++++++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
diff --git a/tests/functional/qemu_test/__init__.py b/tests/functional/qemu_test/__init__.py
index 40a81c3927..49cce620ab 100644
--- a/tests/functional/qemu_test/__init__.py
+++ b/tests/functional/qemu_test/__init__.py
@@ -208,7 +208,8 @@ class QemuBaseTest(unittest.TestCase):
arch = None
workdir = None
- log = logging.getLogger('qemu-test')
+ log = None
+ logdir = None
def setUp(self, bin_prefix):
self.assertIsNotNone(self.qemu_bin, 'QEMU_TEST_QEMU_BINARY must be set')
@@ -219,6 +220,19 @@ def setUp(self, bin_prefix):
if not os.path.exists(self.workdir):
os.makedirs(self.workdir)
+ self.logdir = self.workdir
+ self.log = logging.getLogger('qemu-test')
+ self.log.setLevel(logging.DEBUG)
+ self._log_fh = logging.FileHandler(os.path.join(self.logdir,
+ 'base.log'), mode='w')
+ self._log_fh.setLevel(logging.DEBUG)
+ fileFormatter = logging.Formatter('%(asctime)s - %(levelname)s: %(message)s')
+ self._log_fh.setFormatter(fileFormatter)
+ self.log.addHandler(self._log_fh)
+
+ def tearDown(self):
+ self.log.removeHandler(self._log_fh)
+
def check_hash(self, file_name, expected_hash):
if not expected_hash:
return True
@@ -276,6 +290,15 @@ def setUp(self):
super().setUp('qemu-system-')
+ console_log = logging.getLogger('console')
+ console_log.setLevel(logging.DEBUG)
+ self._console_log_fh = logging.FileHandler(os.path.join(self.workdir,
+ 'console.log'), mode='w')
+ self._console_log_fh.setLevel(logging.DEBUG)
+ fileFormatter = logging.Formatter('%(asctime)s: %(message)s')
+ self._console_log_fh.setFormatter(fileFormatter)
+ console_log.addHandler(self._console_log_fh)
+
def set_machine(self, machinename):
# TODO: We should use QMP to get the list of available machines
if not self._machinehelp:
@@ -366,4 +389,5 @@ def set_vm_arg(self, arg, value):
def tearDown(self):
for vm in self._vms.values():
vm.shutdown()
+ logging.getLogger('console').removeHandler(self._console_log_fh)
super().tearDown()
--
2.45.2
next prev parent reply other threads:[~2024-07-24 17:57 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-24 17:52 [PATCH v2 00/23] Convert avocado tests to normal Python unittests Thomas Huth
2024-07-24 17:52 ` [PATCH v2 01/23] python: Install pycotap in our venv if necessary Thomas Huth
2024-07-29 12:34 ` Philippe Mathieu-Daudé
2024-07-24 17:52 ` [PATCH v2 02/23] tests/functional: Add base classes for the upcoming pytest-based tests Thomas Huth
2024-07-29 12:35 ` Philippe Mathieu-Daudé
2024-07-24 17:52 ` [PATCH v2 03/23] tests/Makefile.include: Increase the level of indentation in the help text Thomas Huth
2024-07-25 11:58 ` Philippe Mathieu-Daudé
2024-07-24 17:52 ` [PATCH v2 04/23] tests/functional: Prepare the meson build system for the functional tests Thomas Huth
2024-07-29 12:36 ` Philippe Mathieu-Daudé
2024-07-24 17:52 ` [PATCH v2 05/23] tests/functional: Convert simple avocado tests into standalone python tests Thomas Huth
2024-07-25 6:55 ` Philippe Mathieu-Daudé
2024-07-25 11:56 ` Philippe Mathieu-Daudé
2024-07-25 11:58 ` Philippe Mathieu-Daudé
2024-07-29 12:37 ` Philippe Mathieu-Daudé
2024-07-24 17:52 ` [PATCH v2 06/23] tests/functional: Convert avocado tests that just need a small adjustment Thomas Huth
2024-07-25 12:04 ` Philippe Mathieu-Daudé
2024-07-29 12:37 ` Philippe Mathieu-Daudé
2024-07-24 17:52 ` [PATCH v2 07/23] tests/functional: Implement fetch_asset() method for downloading assets Thomas Huth
2024-07-24 17:52 ` [PATCH v2 08/23] tests/functional: Convert some tests that download files via fetch_asset() Thomas Huth
2024-07-25 12:05 ` Philippe Mathieu-Daudé
2024-07-24 17:52 ` [PATCH v2 09/23] tests/functional: Add a function for extracting files from an archive Thomas Huth
2024-07-25 11:51 ` Philippe Mathieu-Daudé
2024-07-24 17:52 ` [PATCH v2 10/23] tests/functional: Convert some avocado tests that needed avocado.utils.archive Thomas Huth
2024-07-24 17:52 ` Thomas Huth [this message]
2024-07-24 17:52 ` [PATCH v2 12/23] tests/functional: Convert the s390x avocado tests into standalone tests Thomas Huth
2024-07-24 17:52 ` [PATCH v2 13/23] tests/functional: Convert the x86_cpu_model_versions test Thomas Huth
2024-07-29 12:48 ` Philippe Mathieu-Daudé
2024-07-24 17:52 ` [PATCH v2 14/23] tests/functional: Convert the microblaze avocado tests into standalone tests Thomas Huth
2024-07-24 17:52 ` [PATCH v2 15/23] tests/functional: Convert the riscv_opensbi avocado test into a standalone test Thomas Huth
2024-07-25 5:44 ` Alistair Francis
2024-07-29 13:04 ` Philippe Mathieu-Daudé
2024-07-24 17:52 ` [PATCH v2 16/23] tests/functional: Convert the virtio_gpu " Thomas Huth
2024-07-24 17:52 ` [PATCH v2 17/23] tests/functional: Convert most ppc avocado tests into standalone tests Thomas Huth
2024-07-25 11:55 ` Philippe Mathieu-Daudé
2024-07-24 17:52 ` [PATCH v2 18/23] tests/functional: Convert the ppc_amiga avocado test into a standalone test Thomas Huth
2024-07-24 17:52 ` [PATCH v2 19/23] tests/functional: Convert the ppc_hv " Thomas Huth
2024-07-24 17:52 ` [PATCH v2 20/23] tests/functional: Convert the m68k nextcube test with tesseract Thomas Huth
2024-07-24 17:52 ` [PATCH v2 21/23] tests/functional: Convert the acpi-bits test into a standalone test Thomas Huth
2024-07-24 17:52 ` [PATCH v2 22/23] tests/functional: Convert the rx_gdbsim avocado " Thomas Huth
2024-07-24 17:52 ` [PATCH v2 23/23] gitlab-ci: Add "check-functional" to the build tests Thomas Huth
2024-07-24 23:35 ` [PATCH v2 00/23] Convert avocado tests to normal Python unittests Richard Henderson
2024-07-25 9:55 ` Daniel P. Berrangé
2024-07-25 10:42 ` Richard Henderson
2024-07-25 11:07 ` Daniel P. Berrangé
2024-07-26 13:03 ` Thomas Huth
2024-07-26 13:50 ` Cleber Rosa
2024-07-25 10:13 ` Thomas Huth
2024-07-25 10:50 ` Richard Henderson
2024-07-29 14:44 ` Philippe Mathieu-Daudé
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=20240724175248.1389201-12-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=anisinha@redhat.com \
--cc=berrange@redhat.com \
--cc=farosas@suse.de \
--cc=jsnow@redhat.com \
--cc=pbonzini@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=richard.henderson@linaro.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.