From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7192322883099557888 X-Received: by 2002:a17:902:9a4a:b0:193:91b:980d with SMTP id x10-20020a1709029a4a00b00193091b980dmr2931354plv.25.1674593189016; Tue, 24 Jan 2023 12:46:29 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:902:8c8e:b0:178:35a3:84d9 with SMTP id t14-20020a1709028c8e00b0017835a384d9ls17123469plo.10.-pod-prod-gmail; Tue, 24 Jan 2023 12:46:28 -0800 (PST) X-Google-Smtp-Source: AMrXdXueoeciomiMlZiVFoxV1ZCds47cT6qRy1Yg+WvjeMYyXIgEW0nwObnS2TPyaQ+UEkmIr1h1 X-Received: by 2002:a17:902:e54c:b0:195:f3e3:b923 with SMTP id n12-20020a170902e54c00b00195f3e3b923mr18115859plf.8.1674593188350; Tue, 24 Jan 2023 12:46:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674593188; cv=none; d=google.com; s=arc-20160816; b=LV5hLXZHwLNO3MCFLit7bPJfijYrbxCUO+53rszfhrS9nyUPHMUGmv2kRAofqY7/yu pA02TnUlc02mz4imi8OkcR45aK3N7/ZRs1e3kmdMzCSenqiCvYFH4apnO/n++LLonPA1 DwDR/DOqFkDPdKPOBZrlBrDZITuW5iezVq5iyCiVKBtkjEy0oyc5pVu0xhpb4CLV6bP6 E0g9wPtoSG4noWXFOgYAUc4tQ66T1L7mLVzBRORUQCWunqLnRINNA2ylOlayPCB0wEyG MACDWQjurLfWsMtXdHn6log6C9kifJYc118cemzq/PcXg/YvrlPgMecB/lJDtvTJUB/b MwMQ== 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=a4+H1v2xVnGLlWGjNdIPCa+vE2+sM3uR+hdeNvICzSg=; b=gfAlU4CzOOrWipDcLJwtRElGs6WtarprC6aUv+UILpP//hof9AQFn+lR2/5XSWCRcd KKHe6ggkJ2JbKgI9DJ1eEYDJ3wS5zrO0Huptq9ixV//l61TYFAqyGllsMnC8VU/JvBC9 ked8zNghX8mU+zvxwT9B0kgG62nx5H9F51tbNrc0QqtQuYiCz9etlOb8v9JSdqvVYql+ 3jWLaxVEjI4I/Ou0LHLhT/Ai6KrCLJqo+1aUc8Ex4piP4a9AJmeqMpLqO+TahGhohJ65 XohiX6YyAhNmC8ZWOIuF32TmA1LYYZPnvD8ahOtApHprdVwCU630UgWpiH4A+UI3IKFe /Yng== 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 e10-20020a170902744a00b00189ad838080si182722plt.8.2023.01.24.12.46.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Jan 2023 12:46:28 -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 user-B660.. (IN-213-226-141-182.bitemobile.lv [213.226.141.182] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 30OKk19g023256 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 24 Jan 2023 21:46:25 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v2 12/15] CI: Allow example module checking disabling Date: Tue, 24 Jan 2023 22:45:55 +0200 Message-Id: <20230124204558.31025-13-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230124204558.31025-1-amikan@ilbers.de> References: <20230124204558.31025-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: tdeH7OG5QNsb 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 d229ecb..f373829 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 2c17361..1b4336c 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.34.1