[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 10/11] tests/acceptance: refactor boot_linux to allow code reu
From: |
Pavel Dovgalyuk |
Subject: |
[PATCH v3 10/11] tests/acceptance: refactor boot_linux to allow code reuse |
Date: |
Fri, 29 May 2020 10:05:31 +0300 |
User-agent: |
StGit/0.17.1-dirty |
This patch moves image downloading functions to the separate class to allow
reusing them from record/replay tests.
Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
---
0 files changed
diff --git a/tests/acceptance/boot_linux.py b/tests/acceptance/boot_linux.py
index 075a386300..3aa57e88b0 100644
--- a/tests/acceptance/boot_linux.py
+++ b/tests/acceptance/boot_linux.py
@@ -26,22 +26,8 @@ KVM_NOT_AVAILABLE = ACCEL_NOT_AVAILABLE_FMT % "KVM"
TCG_NOT_AVAILABLE = ACCEL_NOT_AVAILABLE_FMT % "TCG"
-class BootLinux(Test):
- """
- Boots a Linux system, checking for a successful initialization
- """
-
- timeout = 900
- chksum = None
-
- def setUp(self):
- super(BootLinux, self).setUp()
- self.vm.add_args('-smp', '2')
- self.vm.add_args('-m', '1024')
- self.prepare_boot()
- self.prepare_cloudinit()
-
- def prepare_boot(self):
+class BootLinuxBase(Test):
+ def download_boot(self):
self.log.debug('Looking for and selecting a qemu-img binary to be '
'used to create the bootable snapshot image')
# If qemu-img has been built, use it, otherwise the system wide one
@@ -60,17 +46,17 @@ class BootLinux(Test):
if image_arch == 'ppc64':
image_arch = 'ppc64le'
try:
- self.boot = vmimage.get(
+ boot = vmimage.get(
'fedora', arch=image_arch, version='31',
checksum=self.chksum,
algorithm='sha256',
cache_dir=self.cache_dirs[0],
snapshot_dir=self.workdir)
- self.vm.add_args('-drive', 'file=%s' % self.boot.path)
except:
self.cancel('Failed to download/prepare boot image')
+ return boot.path
- def prepare_cloudinit(self):
+ def download_cloudinit(self):
self.log.info('Preparing cloudinit image')
try:
cloudinit_iso = os.path.join(self.workdir, 'cloudinit.iso')
@@ -81,9 +67,32 @@ class BootLinux(Test):
# QEMU's hard coded usermode router address
phone_home_host='10.0.2.2',
phone_home_port=self.phone_home_port)
- self.vm.add_args('-drive', 'file=%s,format=raw' % cloudinit_iso)
except Exception:
self.cancel('Failed to prepared cloudinit image')
+ return cloudinit_iso
+
+class BootLinux(BootLinuxBase):
+ """
+ Boots a Linux system, checking for a successful initialization
+ """
+
+ timeout = 900
+ chksum = None
+
+ def setUp(self):
+ super(BootLinux, self).setUp()
+ self.vm.add_args('-smp', '2')
+ self.vm.add_args('-m', '1024')
+ self.prepare_boot()
+ self.prepare_cloudinit()
+
+ def prepare_boot(self):
+ path = self.download_boot()
+ self.vm.add_args('-drive', 'file=%s' % path)
+
+ def prepare_cloudinit(self):
+ cloudinit_iso = self.download_cloudinit()
+ self.vm.add_args('-drive', 'file=%s,format=raw' % cloudinit_iso)
def launch_and_wait(self):
self.vm.set_console()
- [PATCH v3 00/11] Record/replay acceptance tests, Pavel Dovgalyuk, 2020/05/29
- [PATCH v3 01/11] tests/acceptance: allow console interaction with specific VMs, Pavel Dovgalyuk, 2020/05/29
- [PATCH v3 02/11] tests/acceptance: refactor boot_linux_console test to allow code reuse, Pavel Dovgalyuk, 2020/05/29
- [PATCH v3 03/11] tests/acceptance: add base class record/replay kernel tests, Pavel Dovgalyuk, 2020/05/29
- [PATCH v3 04/11] tests/acceptance: add kernel record/replay test for x86_64, Pavel Dovgalyuk, 2020/05/29
- [PATCH v3 05/11] tests/acceptance: add record/replay test for aarch64, Pavel Dovgalyuk, 2020/05/29
- [PATCH v3 06/11] tests/acceptance: add record/replay test for arm, Pavel Dovgalyuk, 2020/05/29
- [PATCH v3 07/11] tests/acceptance: add record/replay test for ppc64, Pavel Dovgalyuk, 2020/05/29
- [PATCH v3 08/11] tests/acceptance: add record/replay test for m68k, Pavel Dovgalyuk, 2020/05/29
- [PATCH v3 09/11] tests/acceptance: record/replay tests with advcal images, Pavel Dovgalyuk, 2020/05/29
- [PATCH v3 10/11] tests/acceptance: refactor boot_linux to allow code reuse,
Pavel Dovgalyuk <=
- [PATCH v3 11/11] tests/acceptance: Linux boot test for record/replay, Pavel Dovgalyuk, 2020/05/29
- Re: [PATCH v3 00/11] Record/replay acceptance tests, Philippe Mathieu-Daudé, 2020/05/31