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_s390x_topology.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_s390x_topology.py')
| -rwxr-xr-x | tests/functional/test_s390x_topology.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/functional/test_s390x_topology.py b/tests/functional/test_s390x_topology.py index c54c7a8177..82acff4e55 100755 --- a/tests/functional/test_s390x_topology.py +++ b/tests/functional/test_s390x_topology.py @@ -10,8 +10,6 @@ # This work is licensed under the terms of the GNU GPL, version 2 or # later. See the COPYING file in the top-level directory. -import os - from qemu_test import QemuSystemTest, Asset from qemu_test import exec_command from qemu_test import exec_command_and_wait_for_pattern @@ -89,7 +87,7 @@ class S390CPUTopology(QemuSystemTest): self.require_accelerator("kvm") kernel_path = self.ASSET_F35_KERNEL.fetch() initrd_path_xz = self.ASSET_F35_INITRD.fetch() - initrd_path = os.path.join(self.workdir, 'initrd-raw.img') + initrd_path = self.scratch_file('initrd-raw.img') lzma_uncompress(initrd_path_xz, initrd_path) self.vm.set_console() |