Commit 920fff90 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Alex Bennée
Browse files

tests/vm: Be verbose while extracting compressed images 



Depending of the host hardware, copying and extracting VM images can
take up to few minutes. Add verbosity to avoid the user to worry about
VMs hanging.

Signed-off-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190129175403.18017-2-philmd@redhat.com>
Signed-off-by: default avatarAlex Bennée <alex.bennee@linaro.org>
parent 29c33cc1

tests/vm/centos

+2 −1
Original line number Diff line number Diff line
@@ -65,8 +65,9 @@ class CentosVM(basevm.BaseVM): 
    def build_image(self, img):

        cimg = self._download_with_cache("https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1802.qcow2.xz")

        img_tmp = img + ".tmp"

        sys.stderr.write("Extracting the image...\n")

        subprocess.check_call(["cp", "-f", cimg, img_tmp + ".xz"])

        subprocess.check_call(["xz", "-df", img_tmp + ".xz"])

        subprocess.check_call(["xz", "-dvf", img_tmp + ".xz"])

        subprocess.check_call(["qemu-img", "resize", img_tmp, "50G"])

        self.boot(img_tmp, extra_args = ["-cdrom", self._gen_cloud_init_iso()])

        self.wait_ssh()

tests/vm/freebsd

+2 −1
Original line number Diff line number Diff line
@@ -33,8 +33,9 @@ class FreeBSDVM(basevm.BaseVM): 
                sha256sum='adcb771549b37bc63826c501f05121a206ed3d9f55f49145908f7e1432d65891')

        img_tmp_xz = img + ".tmp.xz"

        img_tmp = img + ".tmp"

        sys.stderr.write("Extracting the image...\n")

        subprocess.check_call(["cp", "-f", cimg, img_tmp_xz])

        subprocess.check_call(["xz", "-df", img_tmp_xz])

        subprocess.check_call(["xz", "-dvf", img_tmp_xz])

        if os.path.exists(img):

            os.remove(img)

        os.rename(img_tmp, img)

tests/vm/netbsd

+2 −1
Original line number Diff line number Diff line
@@ -33,8 +33,9 @@ class NetBSDVM(basevm.BaseVM): 
                                         sha256sum='b633d565b0eac3d02015cd0c81440bd8a7a8df8512615ac1ee05d318be015732')

        img_tmp_xz = img + ".tmp.xz"

        img_tmp = img + ".tmp"

        sys.stderr.write("Extracting the image...\n")

        subprocess.check_call(["cp", "-f", cimg, img_tmp_xz])

        subprocess.check_call(["xz", "-df", img_tmp_xz])

        subprocess.check_call(["xz", "-dvf", img_tmp_xz])

        if os.path.exists(img):

            os.remove(img)

        os.rename(img_tmp, img)

tests/vm/openbsd

+2 −1
Original line number Diff line number Diff line
@@ -35,8 +35,9 @@ class OpenBSDVM(basevm.BaseVM): 
                sha256sum='8c6cedc483e602cfee5e04f0406c64eb99138495e8ca580bc0293bcf0640c1bf')

        img_tmp_xz = img + ".tmp.xz"

        img_tmp = img + ".tmp"

        sys.stderr.write("Extracting the image...\n")

        subprocess.check_call(["cp", "-f", cimg, img_tmp_xz])

        subprocess.check_call(["xz", "-df", img_tmp_xz])

        subprocess.check_call(["xz", "-dvf", img_tmp_xz])

        if os.path.exists(img):

            os.remove(img)

        os.rename(img_tmp, img)