From: Anton Mikanovich <amikan@ilbers.de>
To: isar-users@googlegroups.com
Cc: Anton Mikanovich <amikan@ilbers.de>
Subject: [PATCH 11/23] CI: Remove logging hack for job.log
Date: Mon, 25 Mar 2024 17:55:28 +0200 [thread overview]
Message-ID: <20240325155540.4162990-12-amikan@ilbers.de> (raw)
In-Reply-To: <20240325155540.4162990-1-amikan@ilbers.de>
As job.log no more store all the output of executed test cases we don't
need to inject errors in it. And full.log which contains full output
already has errors in it.
Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
---
testsuite/cibuilder.py | 18 ++----------------
1 file changed, 2 insertions(+), 16 deletions(-)
diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py
index d282f8ee..ec2c0044 100755
--- a/testsuite/cibuilder.py
+++ b/testsuite/cibuilder.py
@@ -1,6 +1,5 @@
#!/usr/bin/env python3
-import logging
import os
import pickle
import re
@@ -29,23 +28,10 @@ DEF_VM_TO_SEC = 600
isar_root = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
backup_prefix = '.ci-backup'
-app_log = logging.getLogger("avocado.app")
-
class CanBeFinished(Exception):
pass
class CIBuilder(Test):
- def setUp(self):
- super(CIBuilder, self).setUp()
- job_log = os.path.join(os.path.dirname(self.logdir), '..', 'job.log')
- self._file_handler = logging.FileHandler(filename=job_log)
- self._file_handler.setLevel(logging.ERROR)
- fmt = ('%(asctime)s %(module)-16.16s L%(lineno)-.4d %('
- 'levelname)-5.5s| %(message)s')
- formatter = logging.Formatter(fmt=fmt)
- self._file_handler.setFormatter(formatter)
- app_log.addHandler(self._file_handler)
-
def init(self, build_dir='build', isar_dir=isar_root):
# initialize build_dir and setup environment
# needs to run once (per test case)
@@ -219,7 +205,7 @@ class CIBuilder(Test):
if fd == p1.stdout.fileno():
self.log.info(p1.stdout.readline().rstrip())
if fd == p1.stderr.fileno():
- app_log.error(p1.stderr.readline().rstrip())
+ self.log.error(p1.stderr.readline().rstrip())
p1.wait()
if p1.returncode:
self.fail('Bitbake failed')
@@ -504,7 +490,7 @@ BBPATH .= ":${LAYERDIR}"\
self.log.info('Got login prompt')
return 0
if fd == p1.stderr.fileno():
- app_log.error(p1.stderr.readline().rstrip())
+ self.log.error(p1.stderr.readline().rstrip())
rc = 1
if time.time() > timeout:
--
2.34.1
next prev parent reply other threads:[~2024-03-25 15:56 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-25 15:55 [PATCH 00/23] Additional CI improvements Anton Mikanovich
2024-03-25 15:55 ` [PATCH 01/23] CI: Introduce Standard CI for cross building Anton Mikanovich
2024-03-25 15:55 ` [PATCH 02/23] CI: Rename cross to fast Anton Mikanovich
2024-03-25 15:55 ` [PATCH 03/23] CI: Rename nocross to full Anton Mikanovich
2024-03-25 15:55 ` [PATCH 04/23] CI: Remove test keyword from class names Anton Mikanovich
2024-03-25 15:55 ` [PATCH 05/23] CI: Rename base test cases Anton Mikanovich
2024-03-25 15:55 ` [PATCH 06/23] CI: Remove cleanup before nocross build Anton Mikanovich
2024-03-25 15:55 ` [PATCH 07/23] CI: Update default target to bookworm Anton Mikanovich
2024-03-25 15:55 ` [PATCH 08/23] CI: Remove duplicated targets Anton Mikanovich
2024-03-25 15:55 ` [PATCH 09/23] CI: Run startvm for all qemu targets Anton Mikanovich
2024-03-25 15:55 ` [PATCH 10/23] CI: Fix errors reporting during startvm Anton Mikanovich
2024-03-25 15:55 ` Anton Mikanovich [this message]
2024-03-25 15:55 ` [PATCH 12/23] CI: Do not lost errors on failed processes Anton Mikanovich
2024-03-25 15:55 ` [PATCH 13/23] CI: Remove container package list hack from testsuite Anton Mikanovich
2024-03-25 15:55 ` [PATCH 14/23] CI: Minimize debsrc_cache checking Anton Mikanovich
2024-03-25 15:55 ` [PATCH 15/23] CI: Minimize kselftest checking Anton Mikanovich
2024-03-25 15:55 ` [PATCH 16/23] CI: Do not include testsuites into each other Anton Mikanovich
2024-03-25 15:55 ` [PATCH 17/23] CI: Mark some single testcases with tags Anton Mikanovich
2024-03-25 15:55 ` [PATCH 18/23] CI: Execute startvm testcases after building Anton Mikanovich
2024-03-25 15:55 ` [PATCH 19/23] CI: Fix missing endline in generated config Anton Mikanovich
2024-03-25 15:55 ` [PATCH 20/23] CI: Remove absolute path to citest.py Anton Mikanovich
2024-03-25 15:55 ` [PATCH 21/23] CI: Create avocado.conf inside build_dir Anton Mikanovich
2024-03-25 15:55 ` [PATCH 22/23] CI: Set also cache dir for Avocado Anton Mikanovich
2024-03-25 15:55 ` [PATCH 23/23] CI: Add make world test case Anton Mikanovich
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=20240325155540.4162990-12-amikan@ilbers.de \
--to=amikan@ilbers.de \
--cc=isar-users@googlegroups.com \
/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