From: Liam Merwick Date: Wed, 5 Feb 2020 14:56:05 +0000 (+0000) Subject: tests/boot_linux_console: use os.path for filesystem paths X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=921a9f6db831fb299dcd5336b1861659b02c3964;p=qemu.git tests/boot_linux_console: use os.path for filesystem paths Change extract_from_deb() to use os.path routines to manipulate the filesystem path returned when extracting a file. Suggested-by: Wainer dos Santos Moschetta Signed-off-by: Liam Merwick Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Message-Id: <1580914565-19675-7-git-send-email-liam.merwick@oracle.com> Signed-off-by: Philippe Mathieu-Daudé --- diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py index 16b7503b5f..dca0a940ab 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -49,7 +49,12 @@ class BootLinuxConsole(Test): process.run("ar x %s %s" % (deb, file_path)) archive.extract(file_path, self.workdir) os.chdir(cwd) - return self.workdir + 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 os.path.join() + # interprets it as an absolute path and drops the self.workdir part. + return os.path.normpath(os.path.join(self.workdir, + os.path.relpath(path, '/'))) def extract_from_rpm(self, rpm, path): """