ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

iotests: Move try_remove to iotests.py 

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Message-Id: <20210118105720.14824-4-mreitz@redhat.com>
This commit is contained in:
Max Reitz 2021-01-18 11:57:13 +01:00
parent 59aec86982
commit c5ff5a3caa
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/qemu-iotests/124
View File

@ -23,6 +23,7 @@
import os import os
import iotests import iotests
from iotests import try_remove
def io_write_patterns(img, patterns): def io_write_patterns(img, patterns):
@ -30,13 +31,6 @@ def io_write_patterns(img, patterns):
iotests.qemu_io('-c', 'write -P%s %s %s' % pattern, img) iotests.qemu_io('-c', 'write -P%s %s %s' % pattern, img)
def try_remove(img):
try:
os.remove(img)
except OSError:
pass
def transaction_action(action, **kwargs): def transaction_action(action, **kwargs):
return { return {
'type': action, 'type': action,

11
tests/qemu-iotests/iotests.py
View File

@ -515,12 +515,15 @@ class FilePath:
return False return False
def try_remove(img):
try:
os.remove(img)
except OSError:
pass
def file_path_remover(): def file_path_remover():
for path in reversed(file_path_remover.paths): for path in reversed(file_path_remover.paths):
try: try_remove(path)
os.remove(path)
except OSError:
pass
def file_path(*names, base_dir=test_dir): def file_path(*names, base_dir=test_dir):