Files written by uncompress() and archive_extract() are placed in a temporary directory that is cleaned up when the test exits, making os.remove() redundant. Drop it and the unused os import.
Suggested-by: Philippe Mathieu-Daudé <[email protected]> Signed-off-by: Joel Stanley <[email protected]> --- tests/functional/arm/test_bpim2u.py | 11 ----------- tests/functional/arm/test_orangepi.py | 9 --------- tests/functional/riscv64/test_sifive_u.py | 4 ---- 3 files changed, 24 deletions(-) diff --git a/tests/functional/arm/test_bpim2u.py b/tests/functional/arm/test_bpim2u.py index 8bed64b702fe..9192a2fbec45 100755 --- a/tests/functional/arm/test_bpim2u.py +++ b/tests/functional/arm/test_bpim2u.py @@ -5,8 +5,6 @@ # # SPDX-License-Identifier: GPL-2.0-or-later -import os - from qemu_test import LinuxKernelTest, exec_command_and_wait_for_pattern from qemu_test import Asset, interrupt_interactive_console_until_pattern from qemu_test import skipBigDataTest @@ -54,8 +52,6 @@ def test_arm_bpim2u(self): self.vm.launch() console_pattern = 'Kernel command line: %s' % kernel_command_line self.wait_for_console_pattern(console_pattern) - os.remove(kernel_path) - os.remove(dtb_path) def test_arm_bpim2u_initrd(self): self.set_machine('bpim2u') @@ -86,9 +82,6 @@ def test_arm_bpim2u_initrd(self): 'reboot: Restarting system') # Wait for VM to shut down gracefully self.vm.wait() - os.remove(kernel_path) - os.remove(dtb_path) - os.remove(initrd_path) def test_arm_bpim2u_gmac(self): self.set_machine('bpim2u') @@ -133,9 +126,6 @@ def test_arm_bpim2u_gmac(self): 'reboot: Restarting system') # Wait for VM to shut down gracefully self.vm.wait() - os.remove(kernel_path) - os.remove(dtb_path) - os.remove(rootfs_path) @skipBigDataTest() def test_arm_bpim2u_openwrt_22_03_3(self): @@ -174,7 +164,6 @@ def test_arm_bpim2u_openwrt_22_03_3(self): 'Allwinner sun8i Family') exec_command_and_wait_for_pattern(self, 'cat /proc/iomem', 'system-control@1c00000') - os.remove(image_path) if __name__ == '__main__': LinuxKernelTest.main() diff --git a/tests/functional/arm/test_orangepi.py b/tests/functional/arm/test_orangepi.py index f9bfa8c78d99..09780236553f 100755 --- a/tests/functional/arm/test_orangepi.py +++ b/tests/functional/arm/test_orangepi.py @@ -5,7 +5,6 @@ # # SPDX-License-Identifier: GPL-2.0-or-later -import os import shutil from qemu_test import LinuxKernelTest, exec_command_and_wait_for_pattern @@ -65,8 +64,6 @@ def test_arm_orangepi(self): self.vm.launch() console_pattern = 'Kernel command line: %s' % kernel_command_line self.wait_for_console_pattern(console_pattern) - os.remove(kernel_path) - os.remove(dtb_path) def test_arm_orangepi_initrd(self): self.set_machine('orangepi-pc') @@ -97,9 +94,6 @@ def test_arm_orangepi_initrd(self): 'reboot: Restarting system') # Wait for VM to shut down gracefully self.vm.wait() - os.remove(kernel_path) - os.remove(dtb_path) - os.remove(initrd_path) def test_arm_orangepi_sd(self): self.set_machine('orangepi-pc') @@ -140,9 +134,6 @@ def test_arm_orangepi_sd(self): 'reboot: Restarting system') # Wait for VM to shut down gracefully self.vm.wait() - os.remove(kernel_path) - os.remove(dtb_path) - os.remove(rootfs_path) @skipBigDataTest() def test_arm_orangepi_armbian(self): diff --git a/tests/functional/riscv64/test_sifive_u.py b/tests/functional/riscv64/test_sifive_u.py index 54a0f9c64845..6bf5be15f93a 100755 --- a/tests/functional/riscv64/test_sifive_u.py +++ b/tests/functional/riscv64/test_sifive_u.py @@ -10,8 +10,6 @@ # # SPDX-License-Identifier: GPL-2.0-or-later -import os - from qemu_test import Asset, LinuxKernelTest @@ -49,8 +47,6 @@ def do_test_riscv64_sifive_u_mmc_spi(self, connect_card): self.vm.launch() self.wait_for_console_pattern(pattern) - os.remove(rootfs_path) - def test_riscv64_sifive_u_nommc_spi(self): self.do_test_riscv64_sifive_u_mmc_spi(False) -- 2.47.3
