From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7350330382288420864 X-Received: by 2002:a19:5e58:0:b0:513:a724:3b9f with SMTP id z24-20020a195e58000000b00513a7243b9fmr4882271lfi.7.1711382161792; Mon, 25 Mar 2024 08:56:01 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:f23:b0:56c:24d5:d6a4 with SMTP id i35-20020a0564020f2300b0056c24d5d6a4ls110924eda.2.-pod-prod-09-eu; Mon, 25 Mar 2024 08:56:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGHXNmRQSoOB0ZOp3uR8B47Z4A2TORm7mU6LWMMKoqYocXljL+eU1PyOGXcq6L2nhomPwnT X-Received: by 2002:a17:906:f2ca:b0:a4b:56be:1e9c with SMTP id gz10-20020a170906f2ca00b00a4b56be1e9cmr1223258ejb.36.1711382159732; Mon, 25 Mar 2024 08:55:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711382159; cv=none; d=google.com; s=arc-20160816; b=nb4cx95pBH+0qjnLB77PisGtEvjIn22fg81yahL2CPqn6zIo1WESleRiX9LbjuHvaQ NcMY43G9eq2F3M2F+hEZFiVKq8nqjC/NZlJb6c3Yd1aI7+vp6zoeTpStFp3sVYToOpV7 TfkHpiAEBX18q9h8rDLX14PdNzjG9LsqrnmE59u6FfMZ4byJixROaUR4QAvi5/Q+OHhV 5S7ZQFBZDLdHQKpLm3msWulRDhRslCRuaaFjk5C6zAcHdNX3hN/nYJCRiaCDu1gq9Mas tP9Ma60QAPvzOhu4mWXIuQcEQKnG77k1FdCA8e09V49MfA1h3EXff7W1sDOxVuB9yMtB F1NQ== 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=z+adShdtx7Zxk6VubvDnwhm71AzxKzor7Om8sdeH6U0=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=XGWTf0/8OGGV7+CNdIW5/ZYPjM+cPCS3kSbShdk12RA6dB/utSTvvje69Dhru/01eu vZakrpq5ZtmbBmB8FhoDfMV2FKlghN7jia3c/wftm/tbjhVzbHSVnlo14NbKDtuzZPWe 2eTH+kud3DbRotfWhAoHR5pOy75asqHfMp6Kgz+pfjhsCglwR+YXV1UN3AHg/jvIJtxn x9yBLMh1ZOtMz7MPpbRyJ0an+P6MjCPRZ4w0obZ20iN3hUYFLQfSYQ3br4gDZhikj5xy 6ML37MSgFB9nAzaGpbzu6W1cHBfI+0QBmy4ATz85C9aV3XHqwMNfw/oqv/wTFkJgVaZs baQg==; 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 v14-20020a170906380e00b00a46acd22106si229727ejc.0.2024.03.25.08.55.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 25 Mar 2024 08:55:59 -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 42PFtnLJ011703 (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 10/23] CI: Fix errors reporting during startvm Date: Mon, 25 Mar 2024 17:55:27 +0200 Message-Id: <20240325155540.4162990-11-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: dvtXmTcPZHI7 Test case failure should be triggered by self.fail() API. It helps to prepare much more correct log output. So rebuild error handling of startvm related functions. Signed-off-by: Anton Mikanovich --- testsuite/cibuilder.py | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py index fa30c2f5..d282f8ee 100755 --- a/testsuite/cibuilder.py +++ b/testsuite/cibuilder.py @@ -475,7 +475,7 @@ BBPATH .= ":${LAYERDIR}"\ p1 = subprocess.Popen('exec ' + ' '.join(cmdline), shell=True, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True) - self.log.info("Started VM with pid %s" % (p1.pid)) + self.log.info("Starting VM with pid %s" % (p1.pid)) return p1, cmdline, boot_log @@ -506,8 +506,10 @@ BBPATH .= ":${LAYERDIR}"\ if fd == p1.stderr.fileno(): app_log.error(p1.stderr.readline().rstrip()) - self.log.error("Didn't get login prompt") - return 1 + rc = 1 + if time.time() > timeout: + rc = 2 + return rc def vm_parse_output(self, boot_log, multiconfig, skip_modulecheck): @@ -539,10 +541,8 @@ BBPATH .= ":${LAYERDIR}"\ if (module_output in data or skip_modulecheck): if resize_output and not resize_output in data: rc = 1 - self.log.error("No resize output while expected") else: rc = 2 - self.log.error("No example module output while expected") return rc @@ -553,13 +553,16 @@ BBPATH .= ":${LAYERDIR}"\ def vm_turn_off(self, vm): - pid = self.vm_dict[vm][0] - os.kill(pid, signal.SIGKILL) + try: + pid = self.vm_dict[vm][0] + os.kill(pid, signal.SIGKILL) - del(self.vm_dict[vm]) - self.vm_dump_dict(vm) + del(self.vm_dict[vm]) + self.vm_dump_dict(vm) - self.log.info("Stopped VM with pid %s" % (pid)) + self.log.info("Stopped VM with pid %s" % (pid)) + except ProcessLookupError: + self.log.error("Can't stop VM %s" % vm) def vm_start(self, arch='amd64', distro='buster', @@ -611,7 +614,10 @@ BBPATH .= ":${LAYERDIR}"\ rc = self.vm_wait_boot(p1, timeout) if rc != 0: self.vm_turn_off(vm) - self.fail('Failed to boot qemu machine') + if rc == 2: + self.fail("Didn't get login prompt") + else: + self.fail('Failed to boot qemu machine') if cmd is not None or script is not None: self.ssh_user='ci' @@ -638,7 +644,12 @@ BBPATH .= ":${LAYERDIR}"\ if rc != 0: if not keep: self.vm_turn_off(vm) - self.fail('Failed to parse output') + if rc == 1: + self.fail("No resize output while expected") + elif rc == 2: + self.fail("No example module output while expected") + else: + self.fail('Failed to parse output') if not keep: self.vm_turn_off(vm) -- 2.34.1