From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7075593626590380032 X-Received: by 2002:a05:6512:2082:b0:443:4236:5f57 with SMTP id t2-20020a056512208200b0044342365f57mr18845770lfr.335.1647415022257; Wed, 16 Mar 2022 00:17:02 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:1241:b0:248:b17:7fcf with SMTP id h1-20020a05651c124100b002480b177fcfls202141ljh.8.gmail; Wed, 16 Mar 2022 00:17:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxkYiU+ajzR8GLgXEKKJ+lansm2ePG/xNaxruWF6vtpLPY3mBUZa880GPgweD3A3rHai0bL X-Received: by 2002:a05:651c:1990:b0:249:5730:a979 with SMTP id bx16-20020a05651c199000b002495730a979mr778660ljb.407.1647415021284; Wed, 16 Mar 2022 00:17:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647415021; cv=none; d=google.com; s=arc-20160816; b=P1N/LEtBBUJ5Lns0onN0FsdN+Ex5LvMKMcdAhXa5Bsck0uKnvt56At4V7Q1/Q4W05v VhTYdEfGZI2SQJHr56o0iEwenHnNz3IoYywlufqK/srcw754CLGiSuxJHyv38Z7CLL+9 i8ZMuNr8YW1B7a+xr/IZbFmA2IxK//ZfIlf1kqvzaYVRp3wJoJFwPmArhLoXbGVxLNbD Rt8EPgKQG/Ym3K0GK+F5681BYWvszavq7Q7TlGjT91/h9dH1UvgPBQp9DQrwjieSqftW XkLv/yf7UPCE/6G0+HtALURZN8S68pz3c98JwXwjlt4nK3pj0fFk6/e29eZOmv7LuAzR QPYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from; bh=HmRTiFSFBH6eYHPMCAqP62D7UTQExTxvLaarDh7XF3c=; b=gNF9aU7r8DlQEe8El7lvMrG2HIUmesUVzqus5U/iPaUOlbfvU/J1lobPsiGJMsQiCF MNM+ENM8ViKlCZ/WeYmy3GKCMDj319PwinUUk70Gpe7iSyx3D1/WcTIbebHzJWlEkXB6 lqzC+pUmrua8zt1W9NsBFqu1FUDtPTIrNSe9UvJGYRgcpT7APGwvabSmO0eFxNpiaHGv jqXm4HwLrF6jF4CaNNa6H4EIL5JXtkCUXWLu5MNOWDKKVbdBHndEQBiPPJQH61/qoegp xSCdIRpybmPIWmDxHwEZF4aEA/wjo4Y2CYbhvJbX5RYTW430DNv2+9ZsYrSZChOXlSom zM/g== 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 j3-20020a056512028300b0044897e2b3b0si82740lfp.12.2022.03.16.00.17.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 16 Mar 2022 00:17:01 -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 localhost.localdomain (mm-14-51-214-37.mgts.dynamic.pppoe.byfly.by [37.214.51.14] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 22G7GtBN021311 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 16 Mar 2022 08:17:00 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v3 3/7] CI: Adopt vm_start test logging Date: Wed, 16 Mar 2022 10:16:43 +0300 Message-Id: <20220316071647.8919-4-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220316071647.8919-1-amikan@ilbers.de> References: <20220316071647.8919-1-amikan@ilbers.de> 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: o3uQwLYi9Kjm Adopt stderr output format to made QEMU start tests output logs in the same way like build tests are. Signed-off-by: Anton Mikanovich --- testsuite/cibuilder.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py index 2170ea6..52bb2a5 100755 --- a/testsuite/cibuilder.py +++ b/testsuite/cibuilder.py @@ -216,7 +216,7 @@ class CIBuilder(Test): timeout = time.time() + int(time_to_wait) p1 = subprocess.Popen(cmdline, stdout=subprocess.PIPE, - stderr=subprocess.PIPE) + stderr=subprocess.PIPE, universal_newlines=True) try: poller = select.poll() poller.register(p1.stdout, select.POLLIN) @@ -224,6 +224,8 @@ class CIBuilder(Test): while time.time() < timeout and p1.poll() is None: events = poller.poll(1000 * (timeout - time.time())) for fd, event in events: + if event != select.POLLIN: + continue if fd == p1.stdout.fileno(): # Wait for the complete string if it is read in chunks # like "i", "sar", " login:" @@ -232,7 +234,7 @@ class CIBuilder(Test): if login_prompt in data: raise CanBeFinished if fd == p1.stderr.fileno(): - self.log.error(p1.stderr.readline()) + app_log.error(p1.stderr.readline().rstrip()) except CanBeFinished: self.log.debug('Got login prompt') finally: @@ -240,12 +242,12 @@ class CIBuilder(Test): p1.kill() p1.wait() - if os.path.exists(output_file): + if os.path.exists(output_file) and os.path.getsize(output_file) > 0: with open(output_file, "rb") as f1: data = f1.read() if service_prompt in data and login_prompt in data: return else: - self.log.error(data) + app_log.error(data.decode(errors='replace')) self.fail('Log ' + output_file) -- 2.17.1