From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7067428780549079040 X-Received: by 2002:a5d:4534:0:b0:1e4:9d38:2d4f with SMTP id j20-20020a5d4534000000b001e49d382d4fmr18857842wra.2.1645513994845; Mon, 21 Feb 2022 23:13:14 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6000:1e12:b0:1e4:b617:bc85 with SMTP id bj18-20020a0560001e1200b001e4b617bc85ls1429311wrb.0.gmail; Mon, 21 Feb 2022 23:13:14 -0800 (PST) X-Google-Smtp-Source: ABdhPJz6SP6YKaq6AKESi6H6yVAfqyRweoDP2pMe7Ks6pRs4lpdlFHkgLAeNFJjS1qTXkKbAtgBC X-Received: by 2002:adf:90e2:0:b0:1e3:f5a:553c with SMTP id i89-20020adf90e2000000b001e30f5a553cmr18143256wri.476.1645513994079; Mon, 21 Feb 2022 23:13:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645513994; cv=none; d=google.com; s=arc-20160816; b=wp3EFjKo/r6W7e9MA//g+PBOaKP77Rc456e0I/sZuxHd+Kr/fHt76h8BaFxe5q8tr5 FEvfQQi227JaJipW2waphMCleC4hIByQ7n5th7cPZuM+mLnZpHtcaoA9UAS1XCRseGwc AvuxicZrXDeqHhUB6H6Np2dE1uKrs8Me5CckkofzVBRCWkeVKNsnf+nDGkT6wjO6qn14 Zi1Z3sDsuubl0Z+DaCnqFJJYeUPXZ+QJd5PZyLLqx7VNMCCcLbgrzCCsSYqbQbhzIMYy 91cd9xxAFSgxx1QpxkWkArSnWu5pDwG3qYXv3yM2UshyOa/+uqvGoTmAjrkJ8Ypaz0yA 4mBA== 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=knS0aQmawrYHbU168+7qtMxJAa6KYN3V28idC2dXuyg=; b=XxFywTNjMkkBT/l14u21MYXOHCnoiCNlKvGxnbSHSSDI93sCrem+Essztox/A9j/x3 Y5k2BzTqYfavEEtEYv+KDqkumJHnWvpdczJq+pTWJ3XItpmF5NwGgqVty7xQH2LhWPQv xMElsk9mjjh3fiBJDR6pJhxNSH4XuC5GtilsznyGFwFknvnf6IagQZs/jp33nsmAimne GjB/wM+u9pBUZQ4GvczawRTkVKjktZzkqiTh5axNZglDMkU/TEeGPSIvnKz9OtZx7MWO LVqiIpK8s++iZyKs8umWl/RkkIddMxcdFw63xP0ZWlQy3fS9P08tSfyFfapgErSzhkY6 8AUg== 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 z4si41789wmi.1.2022.02.21.23.13.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 21 Feb 2022 23:13:14 -0800 (PST) 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-5-27-214-37.mgts.dynamic.pppoe.byfly.by [37.214.27.5] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 21M7D8Wt019575 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 22 Feb 2022 08:13:13 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH 3/6] CI: Adopt vm_start test logging Date: Tue, 22 Feb 2022 10:12:56 +0300 Message-Id: <20220222071259.157349-4-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220222071259.157349-1-amikan@ilbers.de> References: <20220222071259.157349-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: kLnqYaLDCIyj 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.25.1