Commit 6c1c4c33 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Eduardo Habkost
Browse files

tests/boot_linux_console: Let extract_from_deb handle various compressions 



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 function avocado.utils.archive.extract() will handle the different
compression format for us.

Signed-off-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190312234541.2887-2-philmd@redhat.com>
Reviewed-by: default avatarCleber Rosa <crosa@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 219dca61

tests/acceptance/boot_linux_console.py

+3 −2
Original line number Diff line number Diff line
@@ -55,8 +55,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.run("ar t %s" % deb).stdout_text.split()[2]

        process.run("ar x %s %s" % (deb, file_path))

        archive.extract(file_path, self.workdir)

        os.chdir(cwd)

        return self.workdir + path