]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
tests/boot_linux_console: Use Avocado archive::gzip_uncompress()
authorPhilippe Mathieu-Daudé <f4bug@amsat.org>
Mon, 28 Oct 2019 23:04:04 +0000 (19:04 -0400)
committerCleber Rosa <crosa@redhat.com>
Mon, 28 Oct 2019 23:04:04 +0000 (19:04 -0400)
Avocado 67.0 [*] introduced the avocado.utils.archive module which
provides handling of gzip files. Use the gzip_uncompress() method.

[*] https://avocado-framework.readthedocs.io/en/67.0/api/utils/avocado.utils.html#avocado.utils.archive.gzip_uncompress

Suggested-by: Cleber Rosa <crosa@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20191028073441.6448-20-philmd@redhat.com>
Reviewed-by: Cleber Rosa <crosa@redhat.com>
Tested-by: Cleber Rosa <crosa@redhat.com>
Signed-off-by: Cleber Rosa <crosa@redhat.com>
tests/acceptance/boot_linux_console.py

index 4b419b0559c3a98a656a345e64224128c7d0edda..67d7e96d980ef863004cb6af6734d8ca40c2d8fd 100644 (file)
@@ -145,10 +145,7 @@ class BootLinuxConsole(Test):
         initrd_hash = 'bf806e17009360a866bf537f6de66590de349a99'
         initrd_path_gz = self.fetch_asset(initrd_url, asset_hash=initrd_hash)
         initrd_path = self.workdir + "rootfs.cpio"
-
-        with gzip.open(initrd_path_gz, 'rb') as f_in:
-            with open(initrd_path, 'wb') as f_out:
-                shutil.copyfileobj(f_in, f_out)
+        archive.gzip_uncompress(initrd_path_gz, initrd_path)
 
         self.vm.set_machine('malta')
         self.vm.set_console()