diff mbox series

[v3,05/11] vm_boot_test: Remove external varianter

Message ID 20210317145225.88050-6-amikan@ilbers.de
State Superseded, archived
Headers show
Series Update Avocado testsuite | expand

Commit Message

Anton Mikanovich March 17, 2021, 4:52 a.m. UTC 
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 <amikan@ilbers.de>
---
 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 mbox series

Patch

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 c937a16..73fee3e 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('===================================================')
@@ -51,3 +48,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')