From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7350330382288420864 X-Received: by 2002:a2e:b16e:0:b0:2d6:c04b:599f with SMTP id a14-20020a2eb16e000000b002d6c04b599fmr5442321ljm.42.1711382163159; Mon, 25 Mar 2024 08:56:03 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:81d0:0:b0:2d6:a8d9:a8b7 with SMTP id s16-20020a2e81d0000000b002d6a8d9a8b7ls2679966ljg.1.-pod-prod-05-eu; Mon, 25 Mar 2024 08:56:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGRVq7KpBjOQ9GgrhdJRLAhWNKWxYdScKISb/Oo6hf/Gm6EA+X2jkhGcmTgOd6jLBaaFb8f X-Received: by 2002:a05:651c:2ca:b0:2d4:7373:2a5b with SMTP id f10-20020a05651c02ca00b002d473732a5bmr5874356ljo.47.1711382160881; Mon, 25 Mar 2024 08:56:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711382160; cv=none; d=google.com; s=arc-20160816; b=YnBGU9exjGBCgShjeEP/QQ5woNovRALbT4jPIK0wqhJF7siDbrmCYJMLf7W2uMfoc4 qzTLi6T5jtl5yGZYC6D8bcRFZYFBiv3p0QZqUCA/CMNrnZAiXCFN7drgazjGL5NwUe9g I+2ypYAfIWGaJk92lwqTPZi3Rdvu8ibmft70aXZxNcU9bKV7YAVjpuMHVLpqQTUWXyU2 uApiRoR5zVDrtyO5BYTmC6Tgvu2j4D/XTR5tkNMHEC8tvemsBlAkoU+baXJyQuCV44fQ ctvSlAYpNGjzldXN+LNXwiyS/dMj8DoFZzVsSSkxFN9fT2QAiitA43oHLaee3FKim5Hq V4Tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=7aW+41lctBQUSof1TCCGYlQI/Wb/f0jp00tlYH1Xy2M=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=yyo5p9Rws9YT6y8Dd+SPD5yKc/4/54ORtg95/5k5n/iKLhu46lggHprdpJGqHLh7V5 G0X5q5xpdoN1cJSu3FsZQNckvLI+zxtF+upUOuYpV01Iv5HMEwYQsJ4PWJlKwbQCOwrO g3DQbMqVtsVl5ZrSYaRMyznhBcD136QYDZ6WWB4gD1n0J9ufWBobCgsWylqAPnxmP6K5 D7RaoGJrcJ2COmZmkX90NtNrK8EhJHmRLH7kV4jbndspsPO7d6Vl/xGFrmqJMb88zu64 as5b7jLU505beeYjtd5JvqgPL5c3q9rwYmMVYT1/zsMoN9V10vAb2ZVTLzOxvj9c73Nx DQeQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id e25-20020a2e9859000000b002d46764b564si246279ljj.6.2024.03.25.08.56.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 25 Mar 2024 08:56:00 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from user-B660.promwad.corp ([159.148.83.123]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 42PFtnLK011703 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 25 Mar 2024 16:55:59 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH 11/23] CI: Remove logging hack for job.log Date: Mon, 25 Mar 2024 17:55:28 +0200 Message-Id: <20240325155540.4162990-12-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240325155540.4162990-1-amikan@ilbers.de> References: <20240325155540.4162990-1-amikan@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: 6yY8FLkR8Pud 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 --- 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