From patchwork Mon Jun 29 09:46:16 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 5204 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 29 Jun 2026 11:46:50 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f56.google.com (mail-wm1-f56.google.com [209.85.128.56]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 65T9knqc024038 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 29 Jun 2026 11:46:50 +0200 Received: by mail-wm1-f56.google.com with SMTP id 5b1f17b1804b1-493b0fe9659sf6201505e9.2 for ; Mon, 29 Jun 2026 02:46:50 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1782726397; cv=pass; d=google.com; s=arc-20260327; b=l6WTLzJgZEmFOs3AkBxB2Avck3FqUIatDEEHT0x8huMNNpnoSsJhBT52xJ83TJXPwY DoIc+/N0S7Oj3QqnLbk/zyNSmx3VH/UCJ9n6boSRqQOBwI1F2JHbnhwGJgo7YzSwCAbf 70Tln/JOa4Zna8daexgNFtJZSBV6TAMaIP1/lqNDW+uGz7uVsTveDhuDQgwitTbvqZ7q XWmk32Cwtsm3Xu9j4U3PlDMiKntuj6EJb/dA5Q4verU5W7LnW83TuuxMxt1yTvObw837 l/Lj3QwhPTVBDbReELNr9nlhSOH4dS8ta2m/evKHXErb1jBW+XIXirYrkoxZ4Y5h21C1 DoZA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=KtYHrucJP2nVdQGquCBF3yFNp4MjK8xt45pZBAXGtRc=; fh=Ip/VCnLCPxLhYuIqU+fGS5gGngmK8I5kH0Jzx/5ri0A=; b=MITqSP8xhELOUiBfTVA1xeNtlRMCAeXJXGXTW3U1YeEP1w5adMeh1MeJw99fPgK4F/ 8n8uwkJVIECIASEmaK6UIyLW0vH79FzM4A0JNPqb5XIr2bS1lL5LtjfyOYMl7PuoqqXS nKX2TwE8wVJzOXeqrskZG/T5mxdxXejawmYTuiOtsAEEIk4+8STKCl2K1F659CSl8w6y QRhB2w24Yh8NLGNzOvpP2PmTh43qGdVs6zGQZHFHmpZhJnLr5aJOWE2ojwobEKDBJM4c jN+ybSgt2cHrlDXEvTznWKlnt7tAwfcuymxm0ONUYdg+HsSOMUmA8b9Audh0Pw5QlmHe VqmQ==; darn=isar-build.org ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20251104; t=1782726397; x=1783331197; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=KtYHrucJP2nVdQGquCBF3yFNp4MjK8xt45pZBAXGtRc=; b=voirYYRWnRjEmV6+86iA0erOF4nPfv6vagfG+gvr6JqMiMF5D5ZxHjXJ2SLQQti2sz HMHTljk2LCnCO04KOxXiM9VEj5BpjgqDxt4+TkPtohqKM+br113Nlp31fyaMsQTP1ltW z2hpQAvUeYfAQkiIYVPe1Eid1sPFE1kj4/ZtreggoKW8xsblXAJoSTU52akCAKOC/F41 M4h1JB8ozuJkY015e3LrnXEsZiSmZXKfD1v6DYiaox/3fHeDT4YTLZRN2z+XuahGy5UY cqmJ+iZ1BUCpEntkeF5afrw+xBy9FcOImlFocNnalFimqGjWoabk3ajZTHgGyphMukRs LFrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782726397; x=1783331197; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=KtYHrucJP2nVdQGquCBF3yFNp4MjK8xt45pZBAXGtRc=; b=IilfNZYSyTUBTJbm7dTWkakRlD9px2kw9z7a3ZABrMXrjNe2TbH9EbKJlDrSFzbeQb GNJcHxgwkAh5JqOGRUVewIvXiZmnFQ/Ajhk6p9EneL3l0gdsBYrpSUukM6FuDjRGuoxU BEbswDaWp+lzvN5ePnRmYQ9W57qA+TX+k6prz0IlxDcIVeuATEU2BX2YPlejSuIXdt4N pCzF2K/1al/CViqMPWEzIMKv+B3DohjCnJfHmPbAxcCC9Fv9KrJ/w49uNJyXAw5xG11p MM1sGeN6+E/QVUyIxepyebEP8L2/Y167u2Lq7zOidaCZfAqMF7c8qQiqE4YscclKHqkB I34g== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AFNElJ+niEKwQ9iM+HcLO0meCT/P17bQB8zSs2TorbYyIy0NUwbGhSzynps8kyLHWs2qWKgDl03qfLM=@isar-build.org X-Gm-Message-State: AOJu0YygUJ8MdFTo7+tr6NCfFVpTRISjzr4j2yrxqYSZXJCTMlTlyU/1 Z6ro4VQO1tLtBHfVgzJlSo5RysKdvMgAcKgD6wPHH/e/MCSnzcy9vyUo X-Received: by 2002:a05:600c:a12:b0:490:e19b:bd99 with SMTP id 5b1f17b1804b1-492668ad891mr266857285e9.30.1782726397392; Mon, 29 Jun 2026 02:46:37 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="AX0PUUd+S25aQwj1YGM3ZTnvVVBC2jKme6UheC8XzwTIblSuFQ==" Received: by 2002:a05:600c:154c:b0:493:a6fa:ed2d with SMTP id 5b1f17b1804b1-493a7a59036ls11229445e9.0.-pod-prod-09-eu; Mon, 29 Jun 2026 02:46:35 -0700 (PDT) X-Received: by 2002:a05:600c:810c:b0:492:2ffd:8f8 with SMTP id 5b1f17b1804b1-49266873f6amr233938975e9.15.1782726395339; Mon, 29 Jun 2026 02:46:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1782726395; cv=none; d=google.com; s=arc-20260327; b=Fjw9cNY2TYahEnKdsiqquMe5DFjRiaa57it9cmb55kg0kQqJl2OyHX9ONchpW1dyGo 0EyUI9MkWBRuntjIq28mxKA6mbPyjAZzQSbvUYVmyqUBsHj8FLvsyQmovsI8GeVkjLFR SsyTLKyYTsVIpjrLZK3oq8Z46QXLZ1soX8dZV4GUaUuMBn462oX20F5d8wojERG1SR93 8l2XorbBsYxPJ+SZYEiawL+7LO4HLi/czeuGPynOG/S242nqrtEyVxVzQ9FxMqGsgxtL 4JXcsSZqOavqjS//5Rcw67mV7Vq/VEhRZgnthV+tupdkREpOByPTNj1L+Hl0lZKE1rMx xmsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=EN/yNnFGYnoI9Adg/yi2Fo+YLHimTA4QT7YjmrF+Qu0=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=QulhCAR2iiSMijy+hXMwnKhLzL5LaIEmasu+Ia7s+H9xldZ1omYW2jHk/IjZyfMxev vsBSLS1nSeLeJKcxtyU4g20w/qve8lzwU0eL73DhJdbaYjZ0753W5shuWanvGrjCh/KQ ptPvL9G1n+lzJMm6/auyY3AU/Bk+bzhVFv/VyZ9TwSHcpKbfT4Qr1t+uL9ZzCKSlp/A9 SOWIXMr3fUamaVWagEEyRdB0SxAVXViz4WfBsz7AYwPu1v5rmsPAy0NhRN9sGDClZzpn aPqqpnKSxR9qGFWgi0dmlicaAUpkO9BLw3rorcpPUjG+6kc0peNf0vCXdsNNsw2r5U2O Gjjw==; 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 Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-4926e2b960csi959795e9.1.2026.06.29.02.46.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 29 Jun 2026 02:46:35 -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; 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 65T9kVV7023553 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 29 Jun 2026 11:46:34 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v2 03/11] CI: Fix errors reporting during startvm Date: Mon, 29 Jun 2026 12:46:16 +0300 Message-Id: <20260629094624.855927-4-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260629094624.855927-1-amikan@ilbers.de> References: <20260629094624.855927-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_RP_CERTIFIED,RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS 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-Original-Sender: amikan@ilbers.de X-Original-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 Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= 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. This also fixes KFAIL coverage for startvm test cases. Signed-off-by: Anton Mikanovich --- testsuite/cibuilder.py | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py index f9cca0c7..fca2f2ed 100755 --- a/testsuite/cibuilder.py +++ b/testsuite/cibuilder.py @@ -602,7 +602,7 @@ class CIBuilder(Test): 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, need_sb_cleanup @@ -634,8 +634,10 @@ class CIBuilder(Test): if p1.poll() is not None: break - 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): # the printk of recipes-kernel/example-module @@ -665,13 +667,10 @@ class CIBuilder(Test): if module_output in data or skip_modulecheck: if resize_output and resize_output not in data: rc = 1 - self.log.error("No resize output while expected") else: rc = 2 - self.log.error("No example module output while expected") if ordering_cycle in data: rc = 3 - self.log.error("Systemd services ordering cycle detected") return rc def vm_dump_dict(self, vm): @@ -680,16 +679,19 @@ class CIBuilder(Test): f.close() 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) - if self.vm_dict[vm][3]: - start_vm.sb_cleanup() + if self.vm_dict[vm][3]: + start_vm.sb_cleanup() - 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, @@ -758,7 +760,10 @@ class CIBuilder(Test): 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' @@ -794,7 +799,12 @@ class CIBuilder(Test): 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)