From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7192322883099557888 X-Received: by 2002:a05:6902:1549:b0:80b:997c:c21d with SMTP id r9-20020a056902154900b0080b997cc21dmr2201321ybu.630.1675686848931; Mon, 06 Feb 2023 04:34:08 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a81:a20e:0:b0:527:96db:6a0e with SMTP id w14-20020a81a20e000000b0052796db6a0els2474672ywg.6.-pod-prod-gmail; Mon, 06 Feb 2023 04:34:08 -0800 (PST) X-Google-Smtp-Source: AK7set/Sv3Xk8z1khYlGLP+xPxCDlRBVsw2JE4vdC9F2jX+9CR8O/K+LMkgzRxar36CRShkHRG0u X-Received: by 2002:a81:a901:0:b0:52a:7662:bd9c with SMTP id g1-20020a81a901000000b0052a7662bd9cmr1047099ywh.17.1675686848154; Mon, 06 Feb 2023 04:34:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675686848; cv=none; d=google.com; s=arc-20160816; b=uW3Zw5+U5U5m9biSH1/co+qWZlOCEX4sE7hNwQKDR1Y0y8nbGO01lAkdwSsU0d7ySe v61eDLh/sF8EsMD15blGmykicg1sgFoOVktvBdads9FvGGxGWSEbIT0zIZHVkVv35tgU 4C3g9R0JlyKHlHjOepe8RtjXhp4nNodUkGNQhPGMX9yVnM1/Yq5QNMIC1XJ65pAMpgXf 6275CjNLp8Hk6/VD5qDVjdedukew5F8WpD4PYMj6pb/rm+y0Nd5x3UHuUiuFmyboP3AT qPIvdLaJ0IjV3dcTwKlC7qy0gJwlQqxMN2IZPGifdBabcRiRkbtsq9xr5kbQoaJeY7la W2aA== 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:to:from; bh=R1l9/s0p3zuQTv0d9wb7M7dIm/7gyHAAFj7Pg0Alv28=; b=dvKE1G3UUmJ7GwMH+xuvn83fJhgIdxVjLhncNzZ3O4hz45tLN8YmRzooZwPtQMOrDa rTdIkIxosnzz8+ddz19zb8gqQFGZa8LfHXs3Wb4PVn+PGPCwK1qs7W4CtknEnjixa5+k fUf1oWm8Qqxq/ZRk9v0JAa7oo60gUjlYUopSJMbB28HyOqVkqoAWyZ1qEND8dTsZrkll LqqrHZ5RwInrCgC9uoTngIgKeyFjg2MC7Im8jc5E31+jEvWc+0w00Xj1/TPJxN5Jnoj5 v/oSrt01eR3/bVbcmOX8bKluqMzlWG2kHHVGLIybzGxM7mEyCrjjftUO1ZJYJjqm9ZCW qfig== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id bh13-20020a05690c038d00b004e0c0549c53si963767ywb.2.2023.02.06.04.34.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 06 Feb 2023 04:34:08 -0800 (PST) Received-SPF: pass (google.com: domain of ubely@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 ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from baighyz.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 316CY2Ck005306 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 6 Feb 2023 13:34:06 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v4 12/15] CI: Allow example module checking disabling Date: Mon, 6 Feb 2023 13:33:59 +0100 Message-Id: <20230206123402.2727-13-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230206123402.2727-1-ubely@ilbers.de> References: <20230206123402.2727-1-ubely@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: ZmioTxA9niME From: Anton Mikanovich If the target do not have example-module package compiled it can fail on startvm test currently. Provide internal testsuite API for skipping this test. Signed-off-by: Anton Mikanovich --- testsuite/cibuilder.py | 6 ++++-- testsuite/citest.py | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py index 18ca4919..c6a1eb67 100755 --- a/testsuite/cibuilder.py +++ b/testsuite/cibuilder.py @@ -209,7 +209,8 @@ class CIBuilder(Test): return env['LAYERDIR_' + layer].strip('"') - def vm_start(self, arch='amd64', distro='buster', enforce_pcbios=False): + def vm_start(self, arch='amd64', distro='buster', enforce_pcbios=False, + skip_modulecheck=False): time_to_wait = self.params.get('time_to_wait', default=60) self.log.info('===================================================') @@ -291,7 +292,8 @@ class CIBuilder(Test): if os.path.exists(output_file) and os.path.getsize(output_file) > 0: with open(output_file, "rb") as f1: data = f1.read() - if module_output in data and login_prompt in data: + if (module_output in data or skip_modulecheck) \ + and login_prompt in data: if resize_output: if resize_output in data: return diff --git a/testsuite/citest.py b/testsuite/citest.py index f5cead59..cdbede05 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -69,7 +69,7 @@ class DevTest(CIBaseTest): def test_dev_run_arm_bullseye(self): self.init() - self.vm_start('arm', 'bullseye') + self.vm_start('arm', 'bullseye', skip_modulecheck=True) class ReproTest(CIBaseTest): -- 2.20.1