From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6953642757724307456 X-Received: by 2002:a05:600c:22c9:: with SMTP id 9mr19932536wmg.85.1620542565131; Sat, 08 May 2021 23:42:45 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:6da1:: with SMTP id u1ls5210859wrs.1.gmail; Sat, 08 May 2021 23:42:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwo4FnEXRlYRFZpKV/nuVyumjtglSjvypFIsWvA+6J3MwmQRn+3beBLJZFd4zf9XW2ELsCk X-Received: by 2002:a5d:554a:: with SMTP id g10mr23265427wrw.174.1620542564522; Sat, 08 May 2021 23:42:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620542564; cv=none; d=google.com; s=arc-20160816; b=EWdqNiX56h/8z9ZdIjbo+zLrnYB9dRI40j8HZD1J4jdkFF5tvJlV+Oh3lJxXKd1Xu3 OZINSFjhPqfX3vqUWtJoRAMXRe2tuPjYysioog72EwuzO6QLPQYVo8e3otWw6r/ku8Oj IZ/wLQYIVumWkXFOv6G4iG2culK9VUM2mLa+llW06Qy6xoyemT6/r4r7R48MsXYHF92+ mf/ugW0Lf0ViMFWWEMij0QJ9lkt+Keem2TsVHuqG7Xon2khBugADLsudKLvdRsInC997 07+9a69nWBkuOafh4NmV8Kg4pEsz9ftTraBKxB8ryU1flcluJfrDqnV3PlDTNgHwmZAM JMhA== 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=GGV+xgoIKSsxCUyn5BuiNJy13Ga9bfBaUvlvpLOrxeE=; b=qGJCFeVNWISMok9DkuuMJU0Ykv6atkkNobceNtCP+YV0quZrhB7HiY1ZoclOL/jvI0 P3nXlm6bSfbfid3qB7YiSM7Cd79sgtN4gYupB4C0zT7171GIpC38OgbyoYkTiN4vZypK QRP59LE1zJzpDxVPYKSdD5L2EXeo4TllIP7izR77PIxKtl1fDIKllc5u1YvCG8oLSeAm uY6MszbdwlwB2tOci7MjADwYyxXOHNBavh15Gv4wK56CvYRgSNU3jv+KwRqYQTdhYg8s kLBVB58BP9f+sOTIdOqLLtBw4OZyEw3zUKBTLAqTsLScX1+yJs0H5IeQV3Y5R5qc49dM a18A== 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 f74si690078wmf.4.2021.05.08.23.42.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 08 May 2021 23:42:44 -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 localhost.localdomain (mm-99-50-214-37.mgts.dynamic.pppoe.byfly.by [37.214.50.99] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 1496gViK007988 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sun, 9 May 2021 08:42:43 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v6 06/15] vm_boot_test: Remove external varianter Date: Sun, 9 May 2021 09:42:15 +0300 Message-Id: <20210509064224.96072-7-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210509064224.96072-1-amikan@ilbers.de> References: <20210509064224.96072-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: B3gB4KLrq4BX To get rid of avocado-framework-plugin-varianter-yaml-to-mux pip dependency we should not use yaml-to-mux parameters. Signed-off-by: Anton Mikanovich --- testsuite/vm_boot_test/run.sh | 3 -- testsuite/vm_boot_test/run_fast.sh | 3 ++ testsuite/vm_boot_test/run_full.sh | 3 ++ testsuite/vm_boot_test/variant.yaml | 22 ------------- testsuite/vm_boot_test/vm_boot_test.py | 45 +++++++++++++++++++++++--- 5 files changed, 46 insertions(+), 30 deletions(-) delete mode 100755 testsuite/vm_boot_test/run.sh create mode 100755 testsuite/vm_boot_test/run_fast.sh create mode 100755 testsuite/vm_boot_test/run_full.sh delete mode 100644 testsuite/vm_boot_test/variant.yaml diff --git a/testsuite/vm_boot_test/run.sh b/testsuite/vm_boot_test/run.sh deleted file mode 100755 index 9fdda95..0000000 --- a/testsuite/vm_boot_test/run.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -avocado run vm_boot_test.py --mux-yaml test:variant.yaml --mux-inject build_dir:$BUILDDIR time_to_wait:300 diff --git a/testsuite/vm_boot_test/run_fast.sh b/testsuite/vm_boot_test/run_fast.sh new file mode 100755 index 0000000..0fc77b3 --- /dev/null +++ b/testsuite/vm_boot_test/run_fast.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +avocado run vm_boot_test.py -t fast -p build_dir="$BUILDDIR" -p time_to_wait=300 diff --git a/testsuite/vm_boot_test/run_full.sh b/testsuite/vm_boot_test/run_full.sh new file mode 100755 index 0000000..a561a36 --- /dev/null +++ b/testsuite/vm_boot_test/run_full.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +avocado run vm_boot_test.py -t full -p build_dir="$BUILDDIR" -p time_to_wait=300 diff --git a/testsuite/vm_boot_test/variant.yaml b/testsuite/vm_boot_test/variant.yaml deleted file mode 100644 index 9ddc634..0000000 --- a/testsuite/vm_boot_test/variant.yaml +++ /dev/null @@ -1,22 +0,0 @@ -variants: !mux - stretch-amd64: - distro: "stretch" - arch: "amd64" - stretch-i386: - distro: "stretch" - arch: "i386" - stretch-arm: - distro: "stretch" - arch: "arm" - stretch-arm64: - distro: "stretch" - arch: "arm64" - buster-amd64: - distro: "buster" - arch: "amd64" - buster-i386: - distro: "buster" - arch: "i386" - buster-arm: - distro: "buster" - arch: "arm" diff --git a/testsuite/vm_boot_test/vm_boot_test.py b/testsuite/vm_boot_test/vm_boot_test.py index 64dfda6..eee14b2 100644 --- a/testsuite/vm_boot_test/vm_boot_test.py +++ b/testsuite/vm_boot_test/vm_boot_test.py @@ -13,13 +13,10 @@ import start_vm from avocado import Test -class VmBootTest(Test): +class VmBase(Test): - def test(self): - # TODO: add default values + def vm_start(self, arch='amd64', distro='buster'): build_dir = self.params.get('build_dir', default='.') - arch = self.params.get('arch', default='arm') - distro = self.params.get('distro', default='stretch') time_to_wait = self.params.get('time_to_wait', default=60) self.log.info('===================================================') @@ -49,3 +46,41 @@ class VmBootTest(Test): return self.fail('Test failed') + +class VmBootTestFast(VmBase): + + """ + Test QEMU image start (fast) + + :avocado: tags=fast,full + """ + def test_arm_stretch(self): + self.vm_start('arm','stretch') + + def test_arm_buster(self): + self.vm_start('arm','buster') + + def test_arm64_stretch(self): + self.vm_start('arm64','stretch') + + def test_amd64_stretch(self): + self.vm_start('amd64','stretch') + +class VmBootTestFull(VmBase): + + """ + Test QEMU image start (full) + + :avocado: tags=full + """ + def test_i386_stretch(self): + self.vm_start('i386','stretch') + + def test_i386_buster(self): + self.vm_start('i386','buster') + + def test_amd64_buster(self): + self.vm_start('amd64','buster') + + def test_amd64_focal(self): + self.vm_start('amd64','focal') -- 2.25.1