mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-07-27 12:23:53 -06:00
tests/functional: convert tests to new archive_extract helper
Replace use of utils.archive_extract and extract_from_deb with the new archive_extract helper. Reviewed-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> Message-ID: <20241217155953.3950506-24-berrange@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
parent
239fd29d6f
commit
5831ed84e7
37 changed files with 134 additions and 205 deletions
|
@ -3,11 +3,8 @@
|
|||
# This work is licensed under the terms of the GNU GPL, version 2 or
|
||||
# later. See the COPYING file in the top-level directory.
|
||||
|
||||
import os
|
||||
|
||||
from .testcase import QemuSystemTest
|
||||
from .cmd import wait_for_console_pattern
|
||||
from .archive import deb_extract
|
||||
|
||||
|
||||
class LinuxKernelTest(QemuSystemTest):
|
||||
|
@ -29,19 +26,3 @@ class LinuxKernelTest(QemuSystemTest):
|
|||
self.vm.launch()
|
||||
if wait_for:
|
||||
self.wait_for_console_pattern(wait_for)
|
||||
|
||||
def extract_from_deb(self, deb_path, path):
|
||||
"""
|
||||
Extracts a file from a deb package into the test workdir
|
||||
|
||||
:param deb_path: path to the deb archive
|
||||
:param path: path within the deb archive of the file to be extracted
|
||||
:returns: path of the extracted file
|
||||
"""
|
||||
deb_extract(deb_path, self.workdir, member="." + path)
|
||||
# Return complete path to extracted file. Because callers to
|
||||
# extract_from_deb() specify 'path' with a leading slash, it is
|
||||
# necessary to use os.path.relpath() as otherwise scratch_file()
|
||||
# interprets it as an absolute path and drops the required prefix
|
||||
return os.path.normpath(self.scratch_file(os.path.relpath(path, '/')))
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue