From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6953642757724307456 X-Received: by 2002:a05:6512:3234:: with SMTP id f20mr15832186lfe.221.1619021131560; Wed, 21 Apr 2021 09:05:31 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:5c8:: with SMTP id 191ls535782ljf.10.gmail; Wed, 21 Apr 2021 09:05:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxHMvIhzKS3Rql7Ckf9t9PFo6H/NhljQBgDrCT94K0RwR/C/9iiNX2mMbmAvMWRjF17x0dl X-Received: by 2002:a2e:9546:: with SMTP id t6mr9208984ljh.10.1619021130516; Wed, 21 Apr 2021 09:05:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619021130; cv=none; d=google.com; s=arc-20160816; b=jJZT4MnqRKT5q/hzdLJqT7n98IOpZiU8ouIUH13pAIcxUQIkWhZsJ3mwcVktq/AJJj f4DLAmaPsjUbY/+2EjSbITXgMpLzWpoE5x/jo0AV/FFl/r3wGpE2uQ4mjx3B22b/WhnH f577MbBf3uuqDg2RnHbw9+Q8+ouUWrd+IwVDrpgpJkqMP1NdaCgLwHdw/IaIVaRjiHE6 lT5DyqerUZcFXJ9xOFjoNCkFCVBaDLF+XEuMtP3oxWW2GOw8l30YWojJ9HBQow445ue/ kNSheED0rY7+hrEs3HdEO4tmptd4IdL1WHOqoW9yrET0dtJ5OusgqCn8u/2GqMmEBKCd CDIA== 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=gYdYNLpRbsyBb6dqT/upML7EEAj4ohUx8bAucHoN1hiNKXiDhcRU7tP0kyq+3zLVkZ n+YiokSdXuCEAx8oT4BzzY8e6g6WqLYS7UXeoOMeZBd5JzOjhhZc6kKeHpQE9hYd9Z88 EfeCWHWqJ0J53AplNNSMDIuWkL5YSz/AiU/1CpXE8BtgJjdDpjTwNUAa+fU1ZvMc4L6w KNyEaAzYtCoGEif/294g7P/Crzxt9nSIVaMXBhTyl8w6R+0a7vyV12kUn8UpDe6aJbwp Q6g7U/gFO1f3KeIPCwuAxXHae5hK5SZ7PUqCn0WrCHCy6xi712U0o2mXf7W0N0A96C6/ 9Jww== 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 l11si188830lfg.13.2021.04.21.09.05.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 21 Apr 2021 09:05:30 -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-153-39-214-37.mgts.dynamic.pppoe.byfly.by [37.214.39.153] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 13LG5C75027472 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 21 Apr 2021 18:05:29 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v4 05/14] vm_boot_test: Remove external varianter Date: Wed, 21 Apr 2021 19:04:56 +0300 Message-Id: <20210421160505.67194-6-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210421160505.67194-1-amikan@ilbers.de> References: <20210421160505.67194-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: RNKlBc1wg1xK 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