diff options
| author | Daniel P. Berrangé <berrange@redhat.com> | 2024-12-17 15:59:35 +0000 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2024-12-17 19:39:53 +0100 |
| commit | beaf88c895a5eda649777757c80ab4171de777ff (patch) | |
| tree | 2997421894760cd20018be141d93c1b72ea4e73f /tests/functional/test_arm_aspeed_ast1030.py | |
| parent | bd96e460d3a1fb882e01b385d695070659078ba6 (diff) | |
| download | focaccia-qemu-beaf88c895a5eda649777757c80ab4171de777ff.tar.gz focaccia-qemu-beaf88c895a5eda649777757c80ab4171de777ff.zip | |
tests/functional: switch over to using self.scratch_file()
Replace any instances of
os.path.join(self.workdir, ".../...")
self.workdir + "/.../..."
with
self.scratch_file("...", "...")
which is more compact and portable
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-ID: <20241217155953.3950506-15-berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'tests/functional/test_arm_aspeed_ast1030.py')
| -rwxr-xr-x | tests/functional/test_arm_aspeed_ast1030.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/functional/test_arm_aspeed_ast1030.py b/tests/functional/test_arm_aspeed_ast1030.py index 380a76ec01..01b13c5591 100755 --- a/tests/functional/test_arm_aspeed_ast1030.py +++ b/tests/functional/test_arm_aspeed_ast1030.py @@ -6,8 +6,6 @@ # # SPDX-License-Identifier: GPL-2.0-or-later -import os - from qemu_test import LinuxKernelTest, Asset from qemu_test import exec_command_and_wait_for_pattern from zipfile import ZipFile @@ -27,7 +25,7 @@ class AST1030Machine(LinuxKernelTest): kernel_name = "ast1030-evb-demo/zephyr.elf" with ZipFile(zip_file, 'r') as zf: zf.extract(kernel_name, path=self.workdir) - kernel_file = os.path.join(self.workdir, kernel_name) + kernel_file = self.scratch_file(kernel_name) self.vm.set_console() self.vm.add_args('-kernel', kernel_file, '-nographic') @@ -49,7 +47,7 @@ class AST1030Machine(LinuxKernelTest): kernel_name = "ast1030-evb-demo/zephyr.bin" with ZipFile(zip_file, 'r') as zf: zf.extract(kernel_name, path=self.workdir) - kernel_file = os.path.join(self.workdir, kernel_name) + kernel_file = self.scratch_file(kernel_name) self.vm.set_console() self.vm.add_args('-kernel', kernel_file, '-nographic') |