[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] BootLinuxConsoleTest: Let extract_from_deb handle v
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH] BootLinuxConsoleTest: Let extract_from_deb handle various compressions |
Date: |
Sat, 2 Mar 2019 22:54:54 +0100 |
Debian binary package format supports various compressions.
Per man deb(5):
NAME
deb - Debian binary package format
FORMAT
...
The third, last required member is named data.tar. It contains the
filesystem as a tar archive, either not compressed (supported since
dpkg 1.10.24), or compressed with gzip (with .gz extension),
xz (with .xz extension, supported since dpkg 1.15.6),
bzip2 (with .bz2 extension, supported since dpkg 1.10.24) or
lzma (with .lzma extension, supported since dpkg 1.13.25).
List the archive files to have the 3rd name with the correct extension.
The method avocado.utils.archive.extract() will handle the different
compression format for us.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
Based-on: address@hidden
tests/acceptance/boot_linux_console.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/tests/acceptance/boot_linux_console.py
b/tests/acceptance/boot_linux_console.py
index d866886067..b62b70bbde 100644
--- a/tests/acceptance/boot_linux_console.py
+++ b/tests/acceptance/boot_linux_console.py
@@ -58,8 +58,9 @@ class BootLinuxConsole(Test):
"""
cwd = os.getcwd()
os.chdir(self.workdir)
- process.run("ar x %s data.tar.gz" % deb)
- archive.extract("data.tar.gz", self.workdir)
+ file_path = process.system_output("ar t %s" % deb).split()[2].decode()
+ process.run("ar x %s %s" % (deb, file_path))
+ archive.extract(file_path, self.workdir)
os.chdir(cwd)
return self.workdir + path
--
2.20.1
- [Qemu-devel] [PATCH] BootLinuxConsoleTest: Let extract_from_deb handle various compressions,
Philippe Mathieu-Daudé <=